diff --git a/src/drawscreen.c b/src/drawscreen.c
index 7df4a96..4a716b2 100644
--- a/src/drawscreen.c
+++ b/src/drawscreen.c
@@ -3002,6 +3002,13 @@
 	// keep the command line if possible
 	update_screen(VALID_NO_UPDATE);
 	setcursor();
+
+	if (msg_scrolled == 0)
+	{
+	    // don't want a hit-enter prompt when something else is displayed
+	    msg_didany = FALSE;
+	    need_wait_return = FALSE;
+	}
     }
     cursor_on();
 #ifdef FEAT_GUI