diff --git a/conf.d/forgit.plugin.fish b/conf.d/forgit.plugin.fish
index a1ebe7a..6e29eec 100644
--- a/conf.d/forgit.plugin.fish
+++ b/conf.d/forgit.plugin.fish
@@ -69,14 +69,13 @@ function forgit::diff -d "git diff viewer"
     end
 
     set repo (git rev-parse --show-toplevel)
+    set cmd "echo {} |sed 's/.*]  //' | xargs -I% git diff --color=always $commit -- '$repo/%' | $forgit_diff_pager"
     set opts "
         $FORGIT_FZF_DEFAULT_OPTS
         +m -0 --bind=\"enter:execute($cmd |env LESS='-r' less)\"
         $FORGIT_DIFF_FZF_OPTS
     "
 
-    set cmd "echo {} |sed 's/.*]  //' | xargs -I% git diff --color=always $commit -- '$repo/%' | $forgit_diff_pager"
-
     eval "git diff --name-only $commit -- $files*| sed -E 's/^(.)[[:space:]]+(.*)\$/[\1]  \2/'" | env FZF_DEFAULT_OPTS="$opts" fzf --preview="$cmd"
 end