diff --git a/ChangeLog b/ChangeLog
index 9f71154cb..b89f0957c 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,7 +25,7 @@ $Source$
       - Made the textarea smaller (*1.25 instead of *2) for the window only.
       - Fixed a bug when you changed from a table to a database on the left frame and the
         query window still wants to show the previous table.
-
+    * tbl_query_box.php3: Only show fieldlist, when $table is set.
     * translators.html: Adjusted to same topmenu as Documentation.html.
       With the new 'Transformations' item the bar was too large to fit
       on standard 800x600 browser windows.
diff --git a/tbl_query_box.php3 b/tbl_query_box.php3
index bf91fdb7b..0a0a8e371 100755
--- a/tbl_query_box.php3
+++ b/tbl_query_box.php3
@@ -97,17 +97,22 @@ if (!isset($is_inside_querywindow) ||
     <!-- Query box and bookmark support -->
     <li>
         <a name="querybox"></a>
-            <?php echo sprintf($strRunSQLQuery,  htmlspecialchars($db)) . $queryframe_db_list . ' ' . PMA_showMySQLDocu('Reference', 'SELECT') . '&nbsp;&nbsp;&nbsp;' . $strFields . ':' . "\n"; ?>
-            <select name="dummy" size="1">
-<?php
-    echo "\n";
-    for ($i = 0 ; $i < $fields_cnt; $i++) {
-        echo '                '
-             . '<option value="' . urlencode($fields_list[$i]) . '">' . htmlspecialchars($fields_list[$i]) . '</option>' . "\n";
-    }
-?>
+            <?php echo sprintf($strRunSQLQuery,  htmlspecialchars($db)) . $queryframe_db_list . ' ' . PMA_showMySQLDocu('Reference', 'SELECT'); ?>
+<?php if (isset($table) && $table > 0) { ?>
+             &nbsp;&nbsp;&nbsp;<?php echo $strFields; ?>:
+             <select name="dummy" size="1">
+    <?php
+        echo "\n";
+        for ($i = 0 ; $i < $fields_cnt; $i++) {
+            echo '                '
+                 . '<option value="' . urlencode($fields_list[$i]) . '">' . htmlspecialchars($fields_list[$i]) . '</option>' . "\n";
+        }
+    ?>
             </select>
             <input type="button" name="insert" value="<?php echo($strInsert); ?>" onclick="sqlform.sql_query.value = sqlform.sql_query.value + sqlform.dummy.value" />
+<?php
+}
+?>
             <br />
             <div style="margin-bottom: 5px">
             <textarea name="sql_query" rows="<?php echo $cfg['TextareaRows']; ?>" cols="<?php echo (isset($is_inside_querywindow) && $is_inside_querywindow == TRUE ? ceil($cfg['TextareaCols'] * 1.25) : $cfg['TextareaCols'] * 2); ?>" wrap="virtual" dir="<?php echo $text_dir; ?>"<?php echo $auto_sel; ?>>