diff --git a/assets/keymaps/vim.json b/assets/keymaps/vim.json
index af1822d706..aa3e44892c 100644
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -381,6 +381,12 @@
       "ctrl-q": ["vim::PushLiteral", {}]
     }
   },
+  {
+    "context": "Editor && vim_mode == waiting && (vim_operator == ys || vim_operator == cs)",
+    "bindings": {
+      "escape": "vim::SwitchToNormalMode"
+    }
+  },
   {
     "context": "vim_mode == operator",
     "bindings": {