diff --git a/fish/config.fish b/fish/config.fish
index 49c463d..4c1e0da 100644
--- a/fish/config.fish
+++ b/fish/config.fish
@@ -30,6 +30,18 @@ if test -e ~/.config/fish/local.fish
   source ~/.config/fish/local.fish
 end
 
+# =======
+# Vi Mode
+# =======
+
+function hybrid_bindings --description "Vi-style bindings that inherit emacs-style bindings in all modes"
+    for mode in default insert visual
+        fish_default_key_bindings -M $mode
+    end
+    fish_vi_key_bindings --no-erase
+end
+set -g fish_key_bindings hybrid_bindings
+
 # ========
 # Autojump
 # https://github.com/wting/autojump