diff --git a/src/drawscreen.c b/src/drawscreen.c
index aa5b8f7eb7..ecbdd9f0f2 100644
--- a/src/drawscreen.c
+++ b/src/drawscreen.c
@@ -831,8 +831,9 @@ after_updating_screen(int may_resize_shell UNUSED)
     handle_any_postponed_drop();
 #endif
 
-    // in case it was changed in dont_use_message_window()
-    cmdline_row = Rows - p_ch;
+    if (p_ch == 0)
+	// in case it was changed in dont_use_message_window()
+	cmdline_row = Rows;
 }
 
 /*
diff --git a/src/version.c b/src/version.c
index d8a68626ca..e6ecb97963 100644
--- a/src/version.c
+++ b/src/version.c
@@ -707,6 +707,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    311,
 /**/
     310,
 /**/