diff --git a/ChangeLog b/ChangeLog
index df0fe0ad4..49c91bb82 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,8 @@ $Source$
 2003-07-10 Michal Cihar  <nijel@users.sourceforge.net>
     * lang/spanish: Updated, thanks to Daniel Hinostroza (dhinostroza).
     * lang/italian: Updated, thanks to Pietro Danesi (danone).
+    * footer.inc.php3: Fix JS error when in query window is not active SQL
+      tab.
 
 2003-07-09 Michal Cihar  <nijel@users.sourceforge.net>
     * libraries/auth/cookie.auth.lib.php3: Fixed broken login with backslash
diff --git a/footer.inc.php3 b/footer.inc.php3
index 563e4c76f..e26fe350f 100755
--- a/footer.inc.php3
+++ b/footer.inc.php3
@@ -41,7 +41,7 @@ if ($cfg['QueryFrame'] && $cfg['QueryFrameJS']) {
             <?php
             if (!isset($error_message) || $error_message == '') {
             ?>
-            if (!parent.frames.queryframe.querywindow.document.sqlform.LockFromUpdate.checked) {
+            if (parent.frames.queryframe.querywindow.document.sqlform.LockFromUpdate && !parent.frames.queryframe.querywindow.document.sqlform.LockFromUpdate.checked) {
                 parent.frames.queryframe.querywindow.document.querywindow.db.value = "<?php echo (isset($db) ? addslashes($db) : '') ?>";
                 parent.frames.queryframe.querywindow.document.querywindow.query_history_latest_db.value = "<?php echo (isset($db) ? addslashes($db) : '') ?>";
                 parent.frames.queryframe.querywindow.document.querywindow.table.value = "<?php echo (isset($table) ? addslashes($table) : '') ?>";