diff --git a/src/drawscreen.c b/src/drawscreen.c
index de091e8..aa5b8f7 100644
--- a/src/drawscreen.c
+++ b/src/drawscreen.c
@@ -830,6 +830,9 @@
     // handle the drop now.
     handle_any_postponed_drop();
 #endif
+
+    // in case it was changed in dont_use_message_window()
+    cmdline_row = Rows - p_ch;
 }
 
 /*
@@ -2426,7 +2429,8 @@
 			    if (wp->w_lines_valid > wp->w_height)
 				wp->w_lines_valid = wp->w_height;
 			    for (i = wp->w_lines_valid; i - j >= idx; --i)
-				wp->w_lines[i] = wp->w_lines[i - j];
+				if (i < Rows)
+				    wp->w_lines[i] = wp->w_lines[i - j];
 
 			    // The w_lines[] entries for inserted lines are
 			    // now invalid, but wl_size may be used above.