diff --git a/bin/cd-improved b/bin/cd-improved
index e6f33fc..28a2c35 100644
--- a/bin/cd-improved
+++ b/bin/cd-improved
@@ -4,7 +4,7 @@ root="$(git rev-parse --show-toplevel 2>/dev/null)"
 
 if [ -z "$root" ]
 then
-  cd $@
+  cd "$@"
 else
   if [ -z "$1" ]
   then
@@ -12,7 +12,7 @@ else
   else
     if [ $(echo "$1" | grep '^/') ]
     then cd "$root"$@
-    else cd $@
+    else cd "$@"
     fi
   fi
 fi