diff --git a/functions/dialogs.sh b/functions/dialogs.sh
index 065cde1b..6e1a5670 100644
--- a/functions/dialogs.sh
+++ b/functions/dialogs.sh
@@ -92,11 +92,11 @@ configurator_move_folder_dialog() {
   if [[ ! "$rd_dir_name" == "rdhome" ]]; then # If a sub-folder is being moved, find it's path without the source_root. So /home/deck/retrodeck/roms becomes retrodeck/roms
     local rd_dir_path="$(echo "$dir_to_move" | sed "s/.*\(retrodeck\/.*\)/\1/; s/\/$//")"
   else # Otherwise just set the retrodeck root folder
-    local rd_dir_path="$(basename $dir_to_move)"
+    local rd_dir_path="$(basename "$dir_to_move")"
   fi
 
   if [[ -d "$dir_to_move" ]]; then # If the directory selected to move already exists at the expected location pulled from retrodeck.cfg
-    choice=$(configurator_destination_choice_dialog "RetroDECK Data" "Please choose a destination for the $(basename $dir_to_move) folder.")
+    choice=$(configurator_destination_choice_dialog "RetroDECK Data" "Please choose a destination for the $(basename "$dir_to_move") folder.")
     case $choice in
 
     "Internal Storage" | "SD Card" | "Custom Location" ) # If the user picks a location
@@ -105,17 +105,17 @@ configurator_move_folder_dialog() {
       elif [[ "$choice" == "SD Card" ]]; then # If the user wants to move the folder to the predefined SD card location, set the target as sdcard from retrodeck.cfg
         local dest_root="$sdcard"
       else
-        configurator_generic_dialog "RetroDECK Configurator - Move Folder" "Select the parent folder you would like to store the $(basename $dir_to_move) folder in."
+        configurator_generic_dialog "RetroDECK Configurator - Move Folder" "Select the parent folder you would like to store the $(basename "$dir_to_move") folder in."
         local dest_root=$(directory_browse "RetroDECK directory location") # Set the destination root as the selected custom location
       fi
 
       if [[ (! -z "$dest_root") && ( -w "$dest_root") ]]; then # If user picked a destination and it is writable
-        if [[ (-d "$dest_root/$rd_dir_path") && (! -L "$dest_root/$rd_dir_path") && (! $rd_dir_name == "rdhome") ]] || [[ "$(realpath $dir_to_move)" == "$dest_root/$rd_dir_path" ]]; then # If the user is trying to move the folder to where it already is (excluding symlinks that will be unlinked)
-          configurator_generic_dialog "RetroDECK Configurator - Move Folder" "The $(basename $dir_to_move) folder is already at that location, please pick a new one."
+        if [[ (-d "$dest_root/$rd_dir_path") && (! -L "$dest_root/$rd_dir_path") && (! $rd_dir_name == "rdhome") ]] || [[ "$(realpath "$dir_to_move")" == "$dest_root/$rd_dir_path" ]]; then # If the user is trying to move the folder to where it already is (excluding symlinks that will be unlinked)
+          configurator_generic_dialog "RetroDECK Configurator - Move Folder" "The $(basename "$dir_to_move") folder is already at that location, please pick a new one."
           configurator_move_folder_dialog "$rd_dir_name"
         else
           if [[ $(verify_space "$(echo $dir_to_move | sed 's/\/$//')" "$dest_root") ]]; then # Make sure there is enough space at the destination
-            configurator_generic_dialog "RetroDECK Configurator - Move Folder" "Moving $(basename $dir_to_move) folder to $choice"
+            configurator_generic_dialog "RetroDECK Configurator - Move Folder" "Moving $(basename "$dir_to_move") folder to $choice"
             unlink "$dest_root/$rd_dir_path" # In case there is already a symlink at the picked destination
             move "$dir_to_move" "$dest_root/$rd_dir_path"
             if [[ -d "$dest_root/$rd_dir_path" ]]; then # If the move succeeded
@@ -150,12 +150,12 @@ configurator_move_folder_dialog() {
 
     esac
   else # The folder to move was not found at the path pulled from retrodeck.cfg and it needs to be reconfigured manually.
-    configurator_generic_dialog "RetroDECK Configurator - Move Folder" "The $(basename $dir_to_move) folder was not found at the expected location.\n\nThis may have happened if the folder was moved manually.\n\nPlease select the current location of the folder."
-    dir_to_move=$(directory_browse "RetroDECK $(basename $dir_to_move) directory location")
+    configurator_generic_dialog "RetroDECK Configurator - Move Folder" "The $(basename "$dir_to_move") folder was not found at the expected location.\n\nThis may have happened if the folder was moved manually.\n\nPlease select the current location of the folder."
+    dir_to_move=$(directory_browse "RetroDECK $(basename "$dir_to_move") directory location")
     declare -g "$rd_dir_name=$dir_to_move"
     prepare_component "postmove" "all"
     conf_write
-    configurator_generic_dialog "RetroDECK Configurator - Move Folder" "RetroDECK $(basename $dir_to_move) folder now configured at\n$dir_to_move."
+    configurator_generic_dialog "RetroDECK Configurator - Move Folder" "RetroDECK $(basename "$dir_to_move") folder now configured at\n$dir_to_move."
     configurator_move_folder_dialog "$rd_dir_name"
   fi
 }
diff --git a/functions/other_functions.sh b/functions/other_functions.sh
index 2921fc50..61177835 100644
--- a/functions/other_functions.sh
+++ b/functions/other_functions.sh
@@ -273,8 +273,8 @@ dir_prep() {
 
   # Call me with:
   # dir prep "real dir" "symlink location"
-  real="$(realpath -s $1)"
-  symlink="$(realpath -s $2)"
+  real="$(realpath -s "$1")"
+  symlink="$(realpath -s "$2")"
 
   log d "Preparing directory $symlink in $real"
 
diff --git a/functions/steam_sync.sh b/functions/steam_sync.sh
index c12c289f..64a6077f 100644
--- a/functions/steam_sync.sh
+++ b/functions/steam_sync.sh
@@ -71,7 +71,7 @@ add_to_steam() {
                             echo "$command" >> "$launcher_tmp"
                             chmod +x "$launcher_tmp"
                         else
-                            log d "$(basename $launcher) desktop file already exists"
+                            log d "$(basename "$launcher") desktop file already exists"
                         fi
                     fi