diff --git a/src/winio.c b/src/winio.c
index d2766568937421544282f5282c1d0c6474ae1d62..f143f348a9a00bd3c89f36d77f55ec14a875ba7c 100644
--- a/src/winio.c
+++ b/src/winio.c
@@ -128,8 +128,6 @@ void get_key_buffer(WINDOW *win)
     /* Read in the first character using whatever mode we're in. */
     input = wgetch(win);
 
-    curs_set(0);
-
 #ifndef NANO_TINY
     if (the_window_resized) {
 	ungetch(input);
@@ -138,8 +136,10 @@ void get_key_buffer(WINDOW *win)
     }
 #endif
 
-    if (input == ERR && !waiting_mode)
+    if (input == ERR && !waiting_mode) {
+	curs_set(0);
 	return;
+    }
 
     while (input == ERR) {
 	/* If we've failed to get a character MAX_BUF_SIZE times in a row,
@@ -159,6 +159,8 @@ void get_key_buffer(WINDOW *win)
 	input = wgetch(win);
     }
 
+    curs_set(0);
+
     /* Increment the length of the keystroke buffer, and save the value
      * of the keystroke at the end of it. */
     key_buffer_len++;