diff --git a/share/functions/fish_vi_mode.fish b/share/functions/fish_vi_mode.fish
index 46a2a27d6..e431d0e4a 100644
--- a/share/functions/fish_vi_mode.fish
+++ b/share/functions/fish_vi_mode.fish
@@ -1,5 +1,6 @@
-function fish_prompt
-  fish_vi_prompt
+function fish_vi_mode
+  function fish_prompt
+    fish_vi_prompt
+  end
+  set -g fish_key_bindings fish_vi_key_bindings
 end
-set fish_key_bindings fish_vi_key_bindings
-#fish_vi_key_bindings