diff --git a/ChangeLog b/ChangeLog
index 241fd5809..bdb6ede47 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2004-10-04 Michal Čihař  <michal@cihar.com>
+    * tbl_query_box.php: Reenabled %f substitution.
+
 2004-10-02 Marc Delisle  <lem9@users.sourceforge.net>
     * tbl_alter.php: field structure changes not applied (CVS version only)
     * export.php: bug #1038804, insufficient space to save
diff --git a/tbl_query_box.php b/tbl_query_box.php
index c4ef6fe43..38db1698a 100644
--- a/tbl_query_box.php
+++ b/tbl_query_box.php
@@ -158,7 +158,11 @@ if (!isset($is_inside_querywindow) ||
     if (!empty($query_to_display)) {
         echo htmlspecialchars($query_to_display);
     } elseif (isset($table)) {
-        echo htmlspecialchars(str_replace('%d', PMA_backquote($db), str_replace('%t', PMA_backquote($table), $cfg['DefaultQueryTable'])));
+        echo htmlspecialchars(
+            str_replace('%d', PMA_backquote($db), 
+                str_replace('%t', PMA_backquote($table), 
+                    str_replace('%f', implode(', ', PMA_backquote($fields_list)),
+                        $cfg['DefaultQueryTable']))));
     } else {
         echo htmlspecialchars(str_replace('%d', PMA_backquote($db), $cfg['DefaultQueryDatabase']));
     }