diff --git a/ChangeLog b/ChangeLog
index 048513c83..f1977847a 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2003-03-25 Michal Cihar  <nijel@users.sourceforge.net>
+    * tbl_query_box.php3: One more HTML entities fix.
+
 2003-03-24 Michal Cihar  <nijel@users.sourceforge.net>
     * db_details_structure.php3, mult_submits.inc.php: Added CHECK TABLE to
       multisubmit actions (RFE #622603).
diff --git a/tbl_query_box.php3 b/tbl_query_box.php3
index 18fea180b..383da9be6 100755
--- a/tbl_query_box.php3
+++ b/tbl_query_box.php3
@@ -113,7 +113,7 @@ if (!isset($is_inside_querywindow) ||
             <br />
             <div style="margin-bottom: 5px">
             <textarea name="sql_query" rows="<?php echo $cfg['TextareaRows']; ?>" cols="<?php echo (isset($is_inside_querywindow) && $is_inside_querywindow == TRUE ? ceil($cfg['TextareaCols'] * 1.25) : $cfg['TextareaCols'] * 2); ?>" wrap="virtual" dir="<?php echo $text_dir; ?>"<?php echo $auto_sel; ?>>
-<?php echo ((!empty($query_to_display)) ? htmlspecialchars($query_to_display) : 'SELECT * FROM ' . PMA_backquote($table) . ' WHERE 1'); ?>
+<?php echo ((!empty($query_to_display)) ? htmlspecialchars($query_to_display) : 'SELECT * FROM ' . htmlspecialchars(PMA_backquote($table)) . ' WHERE 1'); ?>
 </textarea><br />
             <input type="checkbox" name="show_query" value="1" id="checkbox_show_query" checked="checked" />&nbsp;
                 <label for="checkbox_show_query"><?php echo $strShowThisQuery; ?></label><br />