diff --git a/src/prompt.c b/src/prompt.c
index 34e7b4c02420288b99b1622f683e482b2a558f33..4bad34d63838a4c5d46f152e5b552004fa928a9b 100644
--- a/src/prompt.c
+++ b/src/prompt.c
@@ -794,6 +794,9 @@ int do_yesno_prompt(bool all, const char *msg)
 	wnoutrefresh(edit);
 	wnoutrefresh(bottomwin);
 
+	/* Ensure that the cursor is visible when waiting for input. */
+	curs_set(1);
+
 	currmenu = MYESNO;
 	kbinput = get_kbinput(bottomwin);
 
diff --git a/src/winio.c b/src/winio.c
index ca3484d1e09a1933903132a666991c56669ff2bd..77e29680c421bac9796f55015f0890d21fd4725f 100644
--- a/src/winio.c
+++ b/src/winio.c
@@ -2079,8 +2079,6 @@ void warn_and_shortly_pause(const char *msg)
     statusbar(msg);
     beep();
     napms(1800);
-
-    curs_set(1);
 }
 
 /* Display a message on the statusbar, and set suppress_cursorpos to