diff --git a/crates/vim/src/vim.rs b/crates/vim/src/vim.rs
index c6905a9c7a..26f7e24cf2 100644
--- a/crates/vim/src/vim.rs
+++ b/crates/vim/src/vim.rs
@@ -65,6 +65,9 @@ impl VimState {
     fn set_enabled(&mut self, enabled: bool, cx: &mut MutableAppContext) {
         if self.enabled != enabled {
             self.enabled = enabled;
+            if enabled {
+                self.mode = Mode::Normal;
+            }
             self.sync_editor_options(cx);
         }
     }