diff --git a/assets/keymaps/vim.json b/assets/keymaps/vim.json
index 045beffece..bd092752e6 100644
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -568,7 +568,7 @@
     }
   },
   {
-    "context": "Editor && vim_mode == normal",
+    "context": "Editor && vim_mode == normal && !VimWaiting",
     "bindings": {
       "g c c": "editor::ToggleComments"
     }