diff --git a/share/functions/__fish_indent.fish b/share/functions/__fish_indent.fish
index 988770ad4..b4c69c2ea 100644
--- a/share/functions/__fish_indent.fish
+++ b/share/functions/__fish_indent.fish
@@ -1,8 +1,11 @@
-function __fish_indent
-    set -l dir "$(path dirname -- (status fish-path 2>/dev/null))"
-    if command -v $dir/fish_indent >/dev/null
+set -l dir "$(path dirname -- (status fish-path 2>/dev/null))"
+
+if command -v $dir/fish_indent >/dev/null
+    function __fish_indent --wraps fish_indent --inherit-variable dir
         $dir/fish_indent $argv
-    else
+    end
+else
+    function __fish_indent --wraps fish_indent
         fish_indent $argv
     end
 end