diff --git a/src/screen.c b/src/screen.c
index c1eb1c4..ce35f02 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -418,8 +418,15 @@
     void
 redraw_after_callback()
 {
-    update_screen(0);
-    setcursor();
+    if (State == HITRETURN || State == ASKMORE)
+	; /* do nothing */
+    else if (State & CMDLINE)
+	redrawcmdline();
+    else if ((State & NORMAL) || (State & INSERT))
+    {
+	update_screen(0);
+	setcursor();
+    }
     cursor_on();
     out_flush();
 #ifdef FEAT_GUI