1 files changed, 5 insertions, 2 deletions
diff --git a/src/nvim/edit.c b/src/nvim/edit.c
index 9a8ff21263..ecc794fb14 100644
--- a/src/nvim/edit.c
+++ b/src/nvim/edit.c
@@ -801,8 +801,8 @@ static int insert_handle_key(InsertState *s)
       goto normalchar;                // insert CTRL-Z as normal char
     }
     do_cmdline_cmd("stop");
-    s->c = Ctrl_O;
-  // FALLTHROUGH
+    ui_cursor_shape();  // may need to update cursor shape
+    break;
 
   case Ctrl_O:        // execute one command
     if (ctrl_x_mode == CTRL_X_OMNI) {
@@ -3001,6 +3001,9 @@ static void ins_compl_addleader(int c)
 {
   int cc;
 
+  if (stop_arrow() == FAIL) {
+        return;
+  }
   if (has_mbyte && (cc = (*mb_char2len)(c)) > 1) {
     char_u buf[MB_MAXBYTES + 1];