diff --git a/ChangeLog b/ChangeLog
index 8bece30ec..7e88fedc4 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,7 @@ $Source$
       Can disable main page icons (bug #965550).
     * header.inc.php, css/phpmyadmin.css.php: Use span insted of div, div is
       not allowed here.
+    * tbl_query_box.php: Fix default query generating.
 
 2004-06-02 Alexander M. Turek  <happybirthdaytome@derrabus.de>
     * db_details_db_info.php, tbl_properties_tbl_info.php: Table type is called
diff --git a/tbl_query_box.php b/tbl_query_box.php
index 95ae73834..bf9529966 100644
--- a/tbl_query_box.php
+++ b/tbl_query_box.php
@@ -142,9 +142,14 @@ if (isset($is_inside_querywindow) && $is_inside_querywindow == TRUE) {
 if (! empty($query_to_display)) {
     echo htmlspecialchars($query_to_display);
 } else {
-    $query = str_replace('%d', PMA_backquote($db), $cfg['DefaultQueryDatabase']);
     if (isset($table)) {
-        $query = str_replace('%f', implode(', ', PMA_backquote($fields_list)), $cfg['DefaultQueryTable']);
+        $query = $cfg['DefaultQueryTable'];
+    } else {
+        $query = $cfg['DefaultQueryDatabase'];
+    }
+    $query = str_replace('%d', PMA_backquote($db), $query);
+    if (isset($table)) {
+        $query = str_replace('%f', implode(', ', PMA_backquote($fields_list)), $query);
         $query = str_replace('%t', PMA_backquote($table), $query);
     }
     echo htmlspecialchars($query);