diff --git a/conf.d/forgit.plugin.fish b/conf.d/forgit.plugin.fish
index 2c893f3..c1865d5 100644
--- a/conf.d/forgit.plugin.fish
+++ b/conf.d/forgit.plugin.fish
@@ -84,7 +84,7 @@ function forgit::diff -d "git diff viewer" --argument-names arg1 arg2
     end
 
     set repo (git rev-parse --show-toplevel)
-    set preview "cd $repo && echo {} | sed 's/.*] *//' | sed 's/  ->  / /' | xargs git diff --color=always $commits -- | $forgit_diff_pager"
+    set preview "cd '$repo' && echo {} | sed 's/.*] *//' | sed 's/  ->  / /' | xargs git diff --color=always $commits -- | $forgit_diff_pager"
     
     set opts "
         $FORGIT_FZF_DEFAULT_OPTS
diff --git a/forgit.plugin.zsh b/forgit.plugin.zsh
index 5442c82..7a9211f 100755
--- a/forgit.plugin.zsh
+++ b/forgit.plugin.zsh
@@ -51,7 +51,7 @@ forgit::diff() {
         fi
     }
     repo="$(git rev-parse --show-toplevel)"
-    cmd="cd $repo && echo {} |sed 's/.*] *//' | sed 's/  ->  / /' |xargs git diff --color=always $commits -- | $forgit_diff_pager"
+    cmd="cd '$repo' && echo {} |sed 's/.*] *//' | sed 's/  ->  / /' |xargs git diff --color=always $commits -- | $forgit_diff_pager"
     opts="
         $FORGIT_FZF_DEFAULT_OPTS
         +m -0 --bind=\"enter:execute($cmd |LESS='-r' less)\"