diff --git a/ChangeLog b/ChangeLog
index 08a993cb7..99e9f6714 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,7 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
-2005-01-24 Michal Čihař  <michal@cihar.com>
+2005-01-23 Marc Delisle  <lem9@users.sourceforge.net>
+    * tbl_query_box.php: bug #1107937, undefined $fields_list
+
+2005-01-23 Michal Čihař  <michal@cihar.com>
     * export.php: Back to Content-Type application/x-bzip2 on bzip2 export
       (bug #1106652).
 
diff --git a/tbl_query_box.php b/tbl_query_box.php
index 312a70211..6d7243048 100644
--- a/tbl_query_box.php
+++ b/tbl_query_box.php
@@ -160,7 +160,7 @@ if (!isset($is_inside_querywindow) ||
                     <textarea name="sql_query" rows="<?php echo $cfg['TextareaRows']; ?>" cols="<?php echo ((isset($is_inside_querywindow) && $is_inside_querywindow == TRUE && $queryframe_tdcolspan != '') ? ceil($cfg['TextareaCols'] * 1.25) : $cfg['TextareaCols'] * 2); ?>" dir="<?php echo $text_dir; ?>"<?php echo $auto_sel; ?>><?php
     if (!empty($query_to_display)) {
         echo htmlspecialchars($query_to_display);
-    } elseif (isset($table) && !empty($table)) {
+    } elseif (isset($table) && !empty($table) && isset($fields_list)) {
         echo htmlspecialchars(
             str_replace('%d', PMA_backquote($db),
                 str_replace('%t', PMA_backquote($table),