diff --git a/src/gui.c b/src/gui.c
index 3a07cf1567f3c55323cc9a39ce8214c500810d54..9c1b147f1c39b60f78eb2d865a6152ee4d93cf5f 100644
--- a/src/gui.c
+++ b/src/gui.c
@@ -4603,11 +4603,11 @@ gui_mouse_correct()
     /* Don't move the mouse when it's left or right of the Vim window */
     if (x < 0 || x > Columns * gui.char_width)
 	return;
+    if (y >= 0
 # ifdef FEAT_WINDOWS
-    if (Y_2_ROW(y) >= tabline_height())
-# else
-    if (y >= 0)
+	    && Y_2_ROW(y) >= tabline_height()
 # endif
+       )
 	wp = xy2win(x, y);
     if (wp != curwin && wp != NULL)	/* If in other than current window */
     {
diff --git a/src/version.c b/src/version.c
index 8eb758b5aec64ec8af35e2eb16ed1a4db24ad7c3..4d825dff6ec82fc0df025ca06e3151e78d79c602 100644
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3,
 /**/
     2,
 /**/