diff --git a/src/version.c b/src/version.c
index 8c49821877..d661c64363 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 */
+/**/
+    1292,
 /**/
     1291,
 /**/
diff --git a/src/window.c b/src/window.c
index 54ab200807..2435952e15 100644
--- a/src/window.c
+++ b/src/window.c
@@ -4077,7 +4077,8 @@ win_find_tabpage(win)
     tabpage_T	*tp;
 
     for (tp = first_tabpage; tp != NULL; tp = tp->tp_next)
-	for (wp = tp->tp_firstwin; wp != NULL; wp = wp->w_next)
+	for (wp = (tp == curtab ? firstwin : tp->tp_firstwin);
+						  wp != NULL; wp = wp->w_next)
 	    if (wp == win)
 		return tp;
     return NULL;