diff --git a/ChangeLog b/ChangeLog
index 9b92f57db..eea502295 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,11 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2003-04-15 Garvin Hicking <me@supergarv.de>
+    * footer.inc.php3, queryframe.php3: Changed anchor target
+      and window name of queryframe as suggested by Armel
+      Fauveau (thanks!)
+
 2003-04-14 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/sqlparser.data.php3: bug 647705: 'NO' is not
       a reserved word in MySQL
diff --git a/footer.inc.php3 b/footer.inc.php3
index fcf51ee9a..c729cd882 100755
--- a/footer.inc.php3
+++ b/footer.inc.php3
@@ -50,7 +50,7 @@ if ($cfg['QueryFrame'] && $cfg['QueryFrameJS']) {
             return false;
         } else if (top.frames.queryframe) {
             new_win_url = 'querywindow.php3?sql_query=' + sql_query + '&<?php echo PMA_generate_common_url(isset($db) ? addslashes($db) : '', isset($table) ? addslashes($table) : '', '&'); ?>';
-            top.frames.queryframe.querywindow=window.open(new_win_url, 'js_querywindow','toolbar=0,location=1,directories=0,status=1,menubar=0,scrollbars=yes,resizable=yes,width=<?php echo $cfg['QueryWindowWidth']; ?>,height=<?php echo $cfg['QueryWindowHeight']; ?>');
+            top.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']; ?>');
     
             if (!top.frames.queryframe.querywindow.opener) {
                top.frames.queryframe.querywindow.opener = top.frames.queryframe;
diff --git a/queryframe.php3 b/queryframe.php3
index 2058902b8..0fdc413ea 100644
--- a/queryframe.php3
+++ b/queryframe.php3
@@ -57,7 +57,7 @@ function open_querywindow(url) {
     if (!querywindow.closed && querywindow.location) {
         querywindow.focus();
     } else {
-        querywindow=window.open(url + '&db=' + document.queryframeform.db.value + '&table=' + document.queryframeform.table.value, 'js_querywindow','toolbar=0,location=0,directories=0,status=1,menubar=0,scrollbars=yes,resizable=yes,width=<?php echo $cfg['QueryWindowWidth']; ?>,height=<?php echo $cfg['QueryWindowHeight']; ?>');
+        querywindow=window.open(url + '&db=' + document.queryframeform.db.value + '&table=' + document.queryframeform.table.value, '','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 (!querywindow.opener) {
@@ -86,9 +86,9 @@ function open_querywindow(url) {
 <?php
 $anchor = 'querywindow.php3?' . PMA_generate_common_url('', '');
 if ($cfg['QueryFrameJS']) {
-    $href = '#';
+    $href = $anchor;
     $target = '';
-    $onclick = 'onClick="javascript:open_querywindow(\'' . $anchor . '\'); return false;"';
+    $onclick = 'onClick="javascript:open_querywindow(this.href); return false;"';
 } else {
     $href = $anchor;
     $target = 'target="phpmain"';