diff --git a/ChangeLog b/ChangeLog
index 278ea7d96..5d48fcace 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@ $Id$
 $Source$
 
 2004-04-27 Garvin Hicking <pma@supergarv.de>
+    * footer.inc.php: Fixed bug #942316 - Consistent window layout for
+      query window.
     * left.php: Fixed bug #942374 - Undefined indizes in left frame
       for light mode. Improved performance. Fixed tab-formatted code and
       adjusted to coding guidelines.
diff --git a/footer.inc.php b/footer.inc.php
index c5ba45d30..bb72462bc 100644
--- a/footer.inc.php
+++ b/footer.inc.php
@@ -88,7 +88,7 @@ if ($cfg['QueryFrame'] && $cfg['QueryFrameJS']) {
             return false;
         } else if (parent.frames.queryframe) {
             new_win_url = 'querywindow.php?sql_query=' + sql_query + '&<?php echo PMA_generate_common_url(isset($db) ? addslashes($db) : '', isset($table) ? addslashes($table) : '', '&'); ?>';
-            parent.frames.queryframe.querywindow=window.open(new_win_url, '','toolbar=0,location=1,directories=0,status=1,menubar=0,scrollbars=yes,resizable=yes,width=<?php echo $cfg['QueryWindowWidth']; ?>,height=<?php echo $cfg['QueryWindowHeight']; ?>');
+            parent.frames.queryframe.querywindow=window.open(new_win_url, '','toolbar=0,location=0,directories=0,status=1,menubar=0,scrollbars=yes,resizable=yes,width=<?php echo $cfg['QueryWindowWidth']; ?>,height=<?php echo $cfg['QueryWindowHeight']; ?>');
 
             if (!parent.frames.queryframe.querywindow.opener) {
                parent.frames.queryframe.querywindow.opener = parent.frames.queryframe;