diff --git a/src/gui_x11.c b/src/gui_x11.c
index 41fcbde2bb..f09d1a0c36 100644
--- a/src/gui_x11.c
+++ b/src/gui_x11.c
@@ -1431,6 +1431,7 @@ gui_mch_init()
 		p_window = h - 1;
 	    Rows = h;
 	}
+	limit_screen_size();
 	/*
 	 * Set the (x,y) position of the main window only if specified in the
 	 * users geometry, so we get good defaults when they don't. This needs
diff --git a/src/version.c b/src/version.c
index 8f7905b31b..d73254f5c5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1286,
 /**/
     1285,
 /**/