diff --git a/plugins/vi-mode/vi-mode.plugin.zsh b/plugins/vi-mode/vi-mode.plugin.zsh
index aa39081f4..2263b8fdc 100644
--- a/plugins/vi-mode/vi-mode.plugin.zsh
+++ b/plugins/vi-mode/vi-mode.plugin.zsh
@@ -67,9 +67,11 @@ else
 fi
 
 bindkey "^P"          up-line-or-search
+bindkey -M vicmd "k" up-line-or-search
 bindkey -M vicmd "^k" up-line-or-search
 bindkey -M viins "^k" up-line-or-search
 bindkey "^N"          down-line-or-search
+bindkey -M vicmd "j" down-line-or-search
 bindkey -M vicmd "^j" down-line-or-search
 bindkey -M viins "^j" down-line-or-search