diff --git a/src/option.c b/src/option.c
index 7d6b954..1b8c3ea 100644
--- a/src/option.c
+++ b/src/option.c
@@ -3577,11 +3577,12 @@
 
 	// Only compute the new window layout when startup has been
 	// completed. Otherwise the frame sizes may be wrong.
-	if (p_ch != old_value && full_screen
+	if ((p_ch != old_value || topframe->fr_height != Rows - p_ch)
+		&& full_screen
 #ifdef FEAT_GUI
 		&& !gui.starting
 #endif
-	   )
+		       )
 	    command_height();
     }