diff --git a/plugins/vi-mode/vi-mode.plugin.zsh b/plugins/vi-mode/vi-mode.plugin.zsh
index d975380d..04b67611 100644
--- a/plugins/vi-mode/vi-mode.plugin.zsh
+++ b/plugins/vi-mode/vi-mode.plugin.zsh
@@ -44,6 +44,10 @@ zle-line-init () {
   override-vi-mode-zle-line-init
 }; zle -N zle-line-init
 
+zle-line-finish () {
+  zle -K viins
+}; zle -N zle-line-finish
+
 autoload -U select-quoted
 zle -N select-quoted
 for m in visual viopp; do