diff --git a/assets/keymaps/vim.json b/assets/keymaps/vim.json
index a44c9af4c1..0e98636e41 100644
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -232,8 +232,8 @@
       "ctrl-x": "vim::Decrement",
       "p": "vim::Paste",
       "shift-p": ["vim::Paste", { "before": true }],
-      "u": "editor::Undo",
-      "ctrl-r": "editor::Redo",
+      "u": "vim::Undo",
+      "ctrl-r": "vim::Redo",
       "r": ["vim::PushOperator", "Replace"],
       "s": "vim::Substitute",
       "shift-s": "vim::SubstituteLine",
diff --git a/crates/vim/src/normal.rs b/crates/vim/src/normal.rs
index 1daf7ef017..781c6bb98a 100644
--- a/crates/vim/src/normal.rs
+++ b/crates/vim/src/normal.rs
@@ -65,6 +65,8 @@ actions!(
         Indent,
         Outdent,
         ToggleComments,
+        Undo,
+        Redo,
     ]
 );
 
@@ -180,6 +182,27 @@ pub(crate) fn register(workspace: &mut Workspace, cx: &mut ViewContext<Workspace
         });
     });
 
+    workspace.register_action(|_: &mut Workspace, _: &Undo, cx| {
+        Vim::update(cx, |vim, cx| {
+            let times = vim.take_count(cx);
+            vim.update_active_editor(cx, |_, editor, cx| {
+                for _ in 0..times.unwrap_or(1) {
+                    editor.undo(&editor::actions::Undo, cx);
+                }
+            });
+        })
+    });
+    workspace.register_action(|_: &mut Workspace, _: &Redo, cx| {
+        Vim::update(cx, |vim, cx| {
+            let times = vim.take_count(cx);
+            vim.update_active_editor(cx, |_, editor, cx| {
+                for _ in 0..times.unwrap_or(1) {
+                    editor.redo(&editor::actions::Redo, cx);
+                }
+            });
+        })
+    });
+
     paste::register(workspace, cx);
     repeat::register(workspace, cx);
     scroll::register(workspace, cx);