1 files changed, 13 insertions, 7 deletions
diff --git a/src/nvim/misc1.c b/src/nvim/misc1.c
index 45e03681eb..4e47311dda 100644
--- a/src/nvim/misc1.c
+++ b/src/nvim/misc1.c
@@ -2503,18 +2503,24 @@ int prompt_for_number(int *mouse_used)
   cmdline_row = 0;
   save_State = State;
   State = ASKMORE;  // prevents a screen update when using a timer
+  // May show different mouse shape.
+  setmouse();
 
   i = get_number(TRUE, mouse_used);
   if (KeyTyped) {
-    /* don't call wait_return() now */
-    /* msg_putchar('\n'); */
-    cmdline_row = msg_row - 1;
-    need_wait_return = FALSE;
-    msg_didany = FALSE;
-    msg_didout = FALSE;
-  } else
+    // don't call wait_return() now
+    if (msg_row > 0) {
+      cmdline_row = msg_row - 1;
+    }
+    need_wait_return = false;
+    msg_didany = false;
+    msg_didout = false;
+  } else {
     cmdline_row = save_cmdline_row;
+  }
   State = save_State;
+  // May need to restore mouse shape.
+  setmouse();
 
   return i;
 }