diff --git a/ChangeLog b/ChangeLog
index 59273159f..7441b7879 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,12 +19,13 @@ $Source$
     * lang/korean update, thanks to Juhyon Kim (woosuhan)
     * lang/hindi update, thanks to Girish Nair (girish_nair)
 
-2002-11-08 Robin Johnson  <robbat2@users.sourceforge.net>
+2002-11-16 Robin Johnson  <robbat2@users.sourceforge.net>
     * lib/sqlparser.data.php3: Bug #639291 fixed
 
 2002-11-16 Alexander M. Turek  <rabus@users.sourceforge.net>
     * tbl_indexes.php3: Fixed bug #638321 (FULLTEXT is not detected correctly
       with MySQL >= 4.0.2-alpha).
+    * sql.php3: Fixed bug #584411 ("USE" command in query box).
 
 2002-11-15 Alexander M. Turek  <rabus@users.sourceforge.net>
     * scripts/create_tables.sql: Added a 'USE' command after 'CREATE DATABASE'.
diff --git a/sql.php3 b/sql.php3
index 669fde12b..502c3bd79 100755
--- a/sql.php3
+++ b/sql.php3
@@ -200,7 +200,7 @@ if ($do_confirm) {
 else {
     if (!isset($sql_query)) {
         $sql_query = '';
-    } 
+    }
     // already stripped at beginning of script
     // else if (get_magic_quotes_gpc()) {
     //    $sql_query = stripslashes($sql_query);
@@ -303,6 +303,18 @@ else {
                           : $err_url;
             PMA_mysqlDie($error, $full_sql_query, '', $full_err_url);
         }
+        
+        // Checks if the current database has changed
+        // This could happen if the user sends a query like "USE `database`;"
+        $res = PMA_mysql_query('SELECT DATABASE() AS "db";');
+        $row = PMA_mysql_fetch_array($res);
+        if ($db != $row['db']) {
+            $db     = $row['db'];
+            $reload = 1;
+        }
+        @mysql_free_result($res);
+        unset($res);
+        unset($row);
 
         // tmpfile remove after convert encoding appended by Y.Kawada
         if (function_exists('PMA_kanji_file_conv')