diff --git a/src/gui.c b/src/gui.c
index b8236c6ab..ed8276679 100644
--- a/src/gui.c
+++ b/src/gui.c
@@ -2873,6 +2873,9 @@ button_set:
      */
     if ((State == NORMAL || State == NORMAL_BUSY || (State & INSERT))
 	    && Y_2_ROW(y) >= topframe->fr_height
+# ifdef FEAT_WINDOWS
+						+ firstwin->w_winrow
+# endif
 	    && button != MOUSE_DRAG
 # ifdef FEAT_MOUSESHAPE
 	    && !drag_status_line
diff --git a/src/version.c b/src/version.c
index e3b6b73b9..d115800fa 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 */
+/**/
+    121,
 /**/
     120,
 /**/