diff --git a/ChangeLog b/ChangeLog
index 249cd93e4..617ad1e08 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,7 +7,8 @@ $Source$
 
 2003-03-25 Michal Cihar  <nijel@users.sourceforge.net>
     * tbl_query_box.php3, tbl_properties_operations.php3,
-      libraries/common.lib.php3, tbl_query_box.php3: More HTML entities fixes.
+      libraries/common.lib.php3, tbl_query_box.php3, querywindow.php3: More
+      HTML entities fixes.
     * read_dump.php3: Fixed detection of $goto.
     * header.inc.php3: Neated URL generating.
 
diff --git a/querywindow.php3 b/querywindow.php3
index 3d5797e81..792b57e12 100644
--- a/querywindow.php3
+++ b/querywindow.php3
@@ -215,8 +215,8 @@ if ($cfg['QueryFrame'] && $cfg['QueryFrameJS']) {
         echo implode("\n", $input_query_history);
     }
 ?>
-    <input type="hidden" name="db" value="<?php echo (isset($db) && $db != '' ? $db : ''); ?>" />
-    <input type="hidden" name="table" value="<?php echo (isset($table) && $table != '' ? $table : ''); ?>" />
+    <input type="hidden" name="db" value="<?php echo (empty($db) ? '' : htmlspecialchars($db)); ?>" />
+    <input type="hidden" name="table" value="<?php echo (empty($table) ? '' : htmlspecialchars($table)); ?>" />
 
     <input type="hidden" name="query_history_latest" value="" />
     <input type="hidden" name="query_history_latest_db" value="" />