diff --git a/ChangeLog b/ChangeLog
index 972159c3f..48ced4111 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - patch #2242765 [core] Navi panel server links wrong,
   thanks to Martin Stricker - martinstricker
 - bug #2186823 [core] bad session.save_path not detected
+- bug #2202709 [core] Re-login causes PMA to forget current table name 
 
 3.1.0.0 (not yet released)
 + [auth] Support for Swekey hardware authentication,
diff --git a/tbl_change.php b/tbl_change.php
index c07e3ad9d..93b55af0d 100644
--- a/tbl_change.php
+++ b/tbl_change.php
@@ -59,7 +59,12 @@ require_once './libraries/file_listing.php';
  * (at this point, $GLOBALS['goto'] will be set but could be empty)
  */
 if (empty($GLOBALS['goto'])) {
-    $GLOBALS['goto'] = 'db_sql.php';
+    if (strlen($table)) {
+        // avoid a problem (see bug #2202709)
+        $GLOBALS['goto'] = 'tbl_sql.php';
+    } else {
+        $GLOBALS['goto'] = 'db_sql.php';
+    }
 }
 /**
  * @todo check if we could replace by "db_|tbl_" - please clarify!?