diff --git a/libraries/sql.lib.php b/libraries/sql.lib.php
index 0dc7b80728..0add3b5067 100644
--- a/libraries/sql.lib.php
+++ b/libraries/sql.lib.php
@@ -1322,7 +1322,6 @@ function PMA_hasCurrentDbChanged($db)
         if ($db !== $current_db) {
             $reload = 1;
         }
-        $GLOBALS['dbi']->selectDb($db);
     }
 
     return $reload;
diff --git a/sql.php b/sql.php
index 6d992a3f15..73b8ff183f 100644
--- a/sql.php
+++ b/sql.php
@@ -173,7 +173,7 @@ if ($goto == 'sql.php') {
     );
 } // end if
 
-
+$GLOBALS['dbi']->selectDb($db);
 PMA_executeQueryAndSendQueryResponse(
     $analyzed_sql_results, $is_gotofile, $db, $table,
     isset($find_real_end) ? $find_real_end : null,