diff --git a/src/prompt.c b/src/prompt.c
index 34e7b4c02420288b99b1622f683e482b2a558f33..7b25f9cc8a66cd8d8e90c4a86768e0e333ce5ae7 100644
--- a/src/prompt.c
+++ b/src/prompt.c
@@ -783,15 +783,12 @@ int do_yesno_prompt(bool all, const char *msg)
 	    onekey("^C", _("Cancel"), width);
 	}
 
+	/* Color the statusbar over its full width and display the question. */
 	wattron(bottomwin, interface_color_pair[TITLE_BAR]);
-
 	blank_statusbar();
 	mvwaddnstr(bottomwin, 0, 0, msg, actual_x(msg, COLS - 1));
-
 	wattroff(bottomwin, interface_color_pair[TITLE_BAR]);
 
-	/* Refresh edit window and statusbar before getting input. */
-	wnoutrefresh(edit);
 	wnoutrefresh(bottomwin);
 
 	currmenu = MYESNO;
diff --git a/src/winio.c b/src/winio.c
index bdedb17dc8722bf67a091d5144fd1aaadd5e75fd..693c81eae1caecfff4274d967f208f04d8576727 100644
--- a/src/winio.c
+++ b/src/winio.c
@@ -3191,7 +3191,6 @@ void spotlight(bool active, const char *word)
 	room--;
 
     reset_cursor();
-    wnoutrefresh(edit);
 
     if (active)
 	wattron(edit, hilite_attribute);
@@ -3207,6 +3206,8 @@ void spotlight(bool active, const char *word)
 
     if (active)
 	wattroff(edit, hilite_attribute);
+
+    wnoutrefresh(edit);
 }
 
 #ifndef DISABLE_EXTRA