diff --git a/src/eval.c b/src/eval.c
index 8303bd3759..dfcb586b10 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -12071,7 +12071,7 @@ f_gettabvar(argvars, rettv)
     typval_T	*argvars;
     typval_T	*rettv;
 {
-    win_T	*win, *oldcurwin;
+    win_T	*oldcurwin;
     tabpage_T	*tp, *oldtabpage;
     dictitem_T	*v;
     char_u	*varname;
@@ -12084,9 +12084,9 @@ f_gettabvar(argvars, rettv)
     tp = find_tabpage((int)get_tv_number_chk(&argvars[0], NULL));
     if (tp != NULL && varname != NULL)
     {
-	/* Set curwin to be our win, temporarily.  Also set the tabpage,
-	 * otherwise the window is not valid. */
-	switch_win(&oldcurwin, &oldtabpage, win, tp, TRUE);
+	/* Set tp to be our tabpage, temporarily.  Also set the window to the
+	 * first window in the tabpage, otherwise the window is not valid. */
+	switch_win(&oldcurwin, &oldtabpage, tp->tp_firstwin, tp, TRUE);
 
 	/* look up the variable */
 	/* Let gettabvar({nr}, "") return the "t:" dictionary. */
diff --git a/src/version.c b/src/version.c
index 5d512a3cda..70b4087552 100644
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    442,
 /**/
     441,
 /**/