diff --git a/ChangeLog b/ChangeLog
index 9b0871534..393ac85ff 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@ $Id$
 $Source$
 
 
+2003-05-12 Michal Cihar  <nijel@users.sourceforge.net>
+    * index.php3: Better fix for #736003.
+
 2003-05-11 Michal Cihar  <nijel@users.sourceforge.net>
     * Documentation.html, config.inc.php3,
       libraries/charset_conversion.lib.php3, libraries/config_import.lib.php3:
diff --git a/index.php3 b/index.php3
index 0a554b806..1cb54bb09 100755
--- a/index.php3
+++ b/index.php3
@@ -87,6 +87,7 @@ $phpmain_hash_js = time();
     <frame src="left.php3?<?php echo $url_query; ?>&amp;hash=<?php echo $phpmain_hash; ?>" name="nav" frameborder="0" />
 <?php
 }
+if ($cfg['QueryFrameJS']) {
 ?>
     <script type="text/javascript">
     <!--
@@ -94,8 +95,11 @@ $phpmain_hash_js = time();
     //-->
     </script>
     <noscript>
+<?php } ?>
         <frame src="<?php echo (empty($db)) ? 'main.php3' : $cfg['DefaultTabDatabase']; ?>?<?php echo $url_query; ?>" name="phpmain<?php echo $phpmain_hash; ?>" frameborder="1" />
+<?php if ($cfg['QueryFrameJS']) { ?>
     </noscript>
+<?php } ?>
 
     <noframes>
         <body bgcolor="#FFFFFF">
