diff --git a/modules/history-substring-search/init.zsh b/modules/history-substring-search/init.zsh
index 3be60ab..86fa103 100644
--- a/modules/history-substring-search/init.zsh
+++ b/modules/history-substring-search/init.zsh
@@ -24,8 +24,17 @@ fi
 # Key Bindings
 #
 
+# Emacs
 bindkey -M emacs "$key_info[Control]P" history-substring-search-up
 bindkey -M emacs "$key_info[Control]N" history-substring-search-down
+
+# Vi
 bindkey -M vicmd "k" history-substring-search-up
 bindkey -M vicmd "j" history-substring-search-down
 
+# Emacs and Vi
+for keymap in 'emacs' 'viins'; do
+  bindkey -M "$keymap" "$key_info[Up]" history-substring-search-up
+  bindkey -M "$keymap" "$key_info[Down]" history-substring-search-down
+done
+