diff --git a/src/eval.c b/src/eval.c
index 7bf52c5..8303bd3 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -12071,7 +12071,8 @@
     typval_T	*argvars;
     typval_T	*rettv;
 {
-    tabpage_T	*tp;
+    win_T	*win, *oldcurwin;
+    tabpage_T	*tp, *oldtabpage;
     dictitem_T	*v;
     char_u	*varname;
     int		done = FALSE;
@@ -12083,13 +12084,21 @@
     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);
+
 	/* look up the variable */
-	v = find_var_in_ht(&tp->tp_vars->dv_hashtab, 0, varname, FALSE);
+	/* Let gettabvar({nr}, "") return the "t:" dictionary. */
+	v = find_var_in_ht(&tp->tp_vars->dv_hashtab, 't', varname, FALSE);
 	if (v != NULL)
 	{
 	    copy_tv(&v->di_tv, rettv);
 	    done = TRUE;
 	}
+
+	/* restore previous notion of curwin */
+	restore_win(oldcurwin, oldtabpage, TRUE);
     }
 
     if (!done && argvars[2].v_type != VAR_UNKNOWN)
diff --git a/src/testdir/test91.in b/src/testdir/test91.in
index e900a52..b66776b 100644
--- a/src/testdir/test91.in
+++ b/src/testdir/test91.in
@@ -55,6 +55,7 @@
 :tabnew
 :tabnew
 :let t:var_list = [1, 2, 3]
+:let t:other = 777
 :let def_list = [4, 5, 6, 7]
 :tabrewind
 :$put =string(gettabvar(3, 'var_list'))
diff --git a/src/testdir/test91.ok b/src/testdir/test91.ok
index 22e1572..809952b 100644
--- a/src/testdir/test91.ok
+++ b/src/testdir/test91.ok
@@ -26,8 +26,8 @@
 0
 [1, 2, 3]
 [1, 2, 3]
-''
-[4, 5, 6, 7]
+{'var_list': [1, 2, 3], 'other': 777}
+{'var_list': [1, 2, 3], 'other': 777}
 [4, 5, 6, 7]
 ''
 [4, 5, 6, 7]
diff --git a/src/version.c b/src/version.c
index 4d9fb1e..1e68b49 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    434,
+/**/
     433,
 /**/
     432,