diff --git a/ChangeLog b/ChangeLog
index a1b040a2e..af50a6049 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2003-04-16 Garvin Hicking <me@supergarv.de>
+    * tbl_query_box.php3: Only hide 'go' SQL button, when in files mode
+      with no $db set
+
 2003-04-16 Marc Delisle  <lem9@users.sourceforge.net>
     * badwords.txt: "status" is not a reserved word
 
diff --git a/tbl_query_box.php3 b/tbl_query_box.php3
index e130c557f..a0cf9c715 100755
--- a/tbl_query_box.php3
+++ b/tbl_query_box.php3
@@ -261,7 +261,7 @@ if (!isset($is_inside_querywindow) ||
     }
 }
 
-if (!isset($is_inside_querywindow) || (isset($is_inside_querywindow) && $is_inside_querywindow == TRUE && isset($querydisplay_tab) && ($querydisplay_tab == 'files' || $querydisplay_tab == 'sql' || $querydisplay_tab == 'full' || ($querydisplay_tab == 'history' && $bookmark_go))) && isset($db) && $db != '') {
+if (!isset($is_inside_querywindow) || (isset($is_inside_querywindow) && $is_inside_querywindow == TRUE && isset($querydisplay_tab) && (($querydisplay_tab == 'files' && isset($db) && $db != '') || $querydisplay_tab == 'sql' || $querydisplay_tab == 'full' || ($querydisplay_tab == 'history' && $bookmark_go)))) {
 ?>
             <input type="submit" name="SQL" value="<?php echo $strGo; ?>" />
 <?php