diff --git a/src/version.c b/src/version.c
index 0117df0..31f1854 100644
--- a/src/version.c
+++ b/src/version.c
@@ -710,6 +710,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1436,
+/**/
     1435,
 /**/
     1434,
diff --git a/src/window.c b/src/window.c
index 46e1b63..bb11638 100644
--- a/src/window.c
+++ b/src/window.c
@@ -6227,7 +6227,7 @@
     if (!skip_win_fix_scroll)
 	win_fix_scroll(TRUE);
 #ifdef FEAT_GUI
-    if (gui.in_use)
+    if (gui.in_use && !gui.starting)
     {
 	if (scroll_region)
 	    scroll_region_reset();