diff --git a/forgit.plugin.fish b/forgit.plugin.fish
index 1d6ca49..9d7a25a 100755
--- a/forgit.plugin.fish
+++ b/forgit.plugin.fish
@@ -67,7 +67,7 @@ function forgit::diff
 
     set repo "(git rev-parse --show-toplevel)"
     set target "\(echo {} | sed 's/.*]  //')"
-    set cmd "git diff --color=always $commit -- $repo/$target | $forgit_pager"
+    set cmd "echo {} |sed 's/.*]  //' |xargs -I% git diff --color=always $commit -- '$repo/%' |$forgit_pager"
     set opts "
         $FORGIT_FZF_DEFAULT_OPTS
         +m -0 --bind=\"enter:execute($cmd |env LESS='-R' less)\"
diff --git a/forgit.plugin.zsh b/forgit.plugin.zsh
index 248c163..878644b 100755
--- a/forgit.plugin.zsh
+++ b/forgit.plugin.zsh
@@ -39,8 +39,7 @@ forgit::diff() {
     }
 
     repo="$(git rev-parse --show-toplevel)"
-    target="\$(echo {} | sed 's/.*]  //')"
-    cmd="git diff --color=always $commit -- $repo/$target | $forgit_pager"
+    cmd="echo {} |sed 's/.*]  //' |xargs -I% git diff --color=always $commit -- '$repo/%' |$forgit_pager"
     opts="
         $FORGIT_FZF_DEFAULT_OPTS
         +m -0 --bind=\"enter:execute($cmd |LESS='-R' less)\"