diff --git a/ChangeLog b/ChangeLog
index fa79b3fb2..dbbdad9d4 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@ $Id$
 $Source$
 
 2003-04-02 Garvin Hicking <me@supergarv.de>
+    * tbl_query_box.php3: RFE #714095. Use backquotes for inserted fields.
     * tbl_move_copy.php3: At least one of the PDF integrity checks
       on moving/copying a table can safely be enabled.
     * tbl_move_copy.php3, tbl_properties_operations.php3: Made 'move to
diff --git a/tbl_query_box.php3 b/tbl_query_box.php3
index 641d91866..cd62a440f 100755
--- a/tbl_query_box.php3
+++ b/tbl_query_box.php3
@@ -102,7 +102,7 @@ if (!isset($is_inside_querywindow) ||
         echo "\n";
         for ($i = 0 ; $i < $fields_cnt; $i++) {
             echo '                '
-                 . '<option value="' . htmlspecialchars($fields_list[$i]) . '">' . htmlspecialchars($fields_list[$i]) . '</option>' . "\n";
+                 . '<option value="' . PMA_backquote(htmlspecialchars($fields_list[$i])) . '">' . htmlspecialchars($fields_list[$i]) . '</option>' . "\n";
         }
     ?>
             </select>