diff --git a/src/term.c b/src/term.c
index f131ebff88..14a05de6de 100644
--- a/src/term.c
+++ b/src/term.c
@@ -3380,7 +3380,8 @@ win_new_shellsize(void)
     {
 	// If 'window' uses the whole screen, keep it using that.
 	// Don't change it when set with "-w size" on the command line.
-	if (p_window == old_Rows - 1 || (old_Rows == 0 && p_window == 0))
+	if (p_window == old_Rows - 1
+		    || (old_Rows == 0 && !option_was_set((char_u *)"window")))
 	    p_window = Rows - 1;
 	old_Rows = Rows;
 	shell_new_rows();	// update window sizes
diff --git a/src/version.c b/src/version.c
index aa027a9dd5..a2f9d297f2 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4523,
 /**/
     4522,
 /**/