diff --git a/src/mouse.c b/src/mouse.c
index 88d17a5450..86400448a8 100644
--- a/src/mouse.c
+++ b/src/mouse.c
@@ -347,8 +347,7 @@ do_mouse(
 	if (!is_drag)			// release, reset got_click
 	{
 	    got_click = FALSE;
-	    if (in_tab_line || in_tabpanel
-		    )
+	    if (in_tab_line || in_tabpanel)
 	    {
 		in_tab_line = FALSE;
 		in_tabpanel = FALSE;
@@ -571,7 +570,7 @@ do_mouse(
 	}
 	return TRUE;
     }
-    else if (is_drag && (in_tabpanel || in_tab_line))
+    else if (is_drag && (in_tabpanel || (in_tab_line && TabPageIdxs != NULL))
     {
 #if defined(FEAT_TABPANEL)
 	if (in_tabpanel)
diff --git a/src/version.c b/src/version.c
index 663e3f5ae2..359790bfd1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -724,6 +724,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1653,
 /**/
     1652,
 /**/