diff --git a/ChangeLog b/ChangeLog
index 8de1e3937..048631965 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,7 @@ $Source$
     * mult_submits.inc.php3: Missing ;.
     * libraries/relation_cleanup.lib.php3, mult_submits.inc.php3, sql.php3:
       Cleanup phpMyAdmin tables also after multi submit actions (RFE #749989).
+    * tbl_query_box.php3: Don't add target if not in query window.
 
 2003-06-05 Marc Delisle  <lem9@users.sourceforge.net>
     * Documentation.html: new faq 6.20 about CREATE TEMPORARY TABLES
diff --git a/tbl_query_box.php3 b/tbl_query_box.php3
index 9e2beb0cd..358014c36 100755
--- a/tbl_query_box.php3
+++ b/tbl_query_box.php3
@@ -86,7 +86,7 @@ if ($cfg['QueryFrame'] && (!$cfg['QueryFrameJS'] && !$db || ($cfg['QueryFrameJS'
     $queryframe_db_list = '';
 }
 
-if ($cfg['QueryFrame'] && $cfg['QueryFrameJS']) {
+if ($cfg['QueryFrame'] && $cfg['QueryFrameJS'] && isset($is_inside_querywindow) && $is_inside_querywindow) {
 ?>
         <script type="text/javascript">
         <!--
@@ -99,7 +99,7 @@ if ($cfg['QueryFrame'] && $cfg['QueryFrameJS']) {
 <?php
 } else {
 ?>
-        <form method="post" target="phpmain<?php echo md5($cfg['PmaAbsoluteUri']); ?>" action="read_dump.php3"<?php if ($is_upload) echo ' enctype="multipart/form-data"'; ?> onsubmit="return checkSqlQuery(this)" name="sqlform">
+        <form method="post" action="read_dump.php3"<?php if ($is_upload) echo ' enctype="multipart/form-data"'; ?> onsubmit="return checkSqlQuery(this)" name="sqlform">
 <?php
 }
 ?>