diff --git a/src/misc1.c b/src/misc1.c
index c39bb98..ca7e25d 100644
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -3116,7 +3116,7 @@
 
 	if (n == KEYLEN_REMOVED)  /* key code removed */
 	{
-	    if (must_redraw)
+	    if (must_redraw != 0 && !need_wait_return && (State & CMDLINE) == 0)
 	    {
 		/* Redrawing was postponed, do it now. */
 		update_screen(0);