diff --git a/src/gui.c b/src/gui.c
index 9160848..0b911b3 100644
--- a/src/gui.c
+++ b/src/gui.c
@@ -687,9 +687,10 @@
     gui.shell_created = TRUE;
 
 #ifndef FEAT_GUI_GTK
-    /* Set the shell size, adjusted for the screen size.  For GTK this only
-     * works after the shell has been opened, thus it is further down. */
-    gui_set_shellsize(TRUE, TRUE, RESIZE_BOTH);
+    // Set the shell size, adjusted for the screen size.  For GTK this only
+    // works after the shell has been opened, thus it is further down.
+    // For MS-Windows pass FALSE for "mustset" to make --windowid work.
+    gui_set_shellsize(FALSE, TRUE, RESIZE_BOTH);
 #endif
 #if defined(FEAT_GUI_MOTIF) && defined(FEAT_MENU)
     /* Need to set the size of the menubar after all the menus have been
diff --git a/src/version.c b/src/version.c
index 594be52..4d39dde 100644
--- a/src/version.c
+++ b/src/version.c
@@ -800,6 +800,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    626,
+/**/
     625,
 /**/
     624,