diff --git a/open-in-server.sh b/open-in-server.sh
index 49a3806..a6691e1 100644
--- a/open-in-server.sh
+++ b/open-in-server.sh
@@ -6,9 +6,9 @@
 ROOTDIR="$(echo $PWD | cut -d/ -f-2,3)"
 
 if [ "$ROOTDIR" == "/mnt/server" ]; then
-    ssh -t server-ts-rsync "cd /mnt/storage/$(echo $PWD | cut -d/ -f4-); fish -l"
+    ssh -t server-ts-rsync "cd \"/mnt/storage/$(echo $PWD | cut -d/ -f4-)\"; fish -l"
 elif [[ "$ROOTDIR" == "/tank1/personal" || "$ROOTDIR" == "/tank1/media" ]]; then
-    ssh -t server-ts-rsync "cd $PWD; fish -l"
+    ssh -t server-ts-rsync "cd \"$PWD\"; fish -l"
 else
     echo "Unsupported directory."
     echo "Only /mnt/server/*, /tank1/* are supported."