1 files changed, 7 insertions, 5 deletions
diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c
index a19cb36d12..3ce8263457 100644
--- a/src/nvim/ex_getln.c
+++ b/src/nvim/ex_getln.c
@@ -627,11 +627,13 @@ getcmdline (
     }
 
     if (c == cedit_key || c == K_CMDWIN) {
-      /*
-       * Open a window to edit the command line (and history).
-       */
-      c = ex_window();
-      some_key_typed = TRUE;
+      if (ex_normal_busy == 0 && got_int == FALSE) {
+        /*
+         * Open a window to edit the command line (and history).
+         */
+        c = ex_window();
+        some_key_typed = TRUE;
+      }
     } else
       c = do_digraph(c);