1 files changed, 8 insertions, 4 deletions
diff --git a/src/nvim/edit.c b/src/nvim/edit.c
index d7910347fc..b9ecbc71fe 100644
--- a/src/nvim/edit.c
+++ b/src/nvim/edit.c
@@ -593,9 +593,17 @@ edit (
      * Get a character for Insert mode.  Ignore K_IGNORE.
      */
     lastc = c;                          /* remember previous char for CTRL-D */
+    event_enable_deferred();
     do {
       c = safe_vgetc();
     } while (c == K_IGNORE);
+    event_disable_deferred();
+
+    if (c == K_EVENT) {
+      c = lastc;
+      event_process();
+      continue;
+    }
 
     /* Don't want K_CURSORHOLD for the second key, e.g., after CTRL-V. */
     did_cursorhold = TRUE;
@@ -943,10 +951,6 @@ doESCkey:
       did_cursorhold = TRUE;
       break;
 
-    case K_EVENT:
-      event_process();
-      break;
-
     case K_HOME:        /* <Home> */
     case K_KHOME:
     case K_S_HOME: