diff --git a/src/getchar.c b/src/getchar.c
index 8edf0a3..1073d80 100644
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -2713,7 +2713,8 @@
 		 * changed text so far. Also for when 'lazyredraw' is set and
 		 * redrawing was postponed because there was something in the
 		 * input buffer (e.g., termresponse). */
-		if (((State & INSERT) || p_lz) && advance && must_redraw != 0)
+		if (((State & INSERT) != 0 || p_lz) && (State & CMDLINE) == 0
+			  && advance && must_redraw != 0 && !need_wait_return)
 		{
 		    update_screen(0);
 		    setcursor(); /* put cursor back where it belongs */