diff --git a/ChangeLog b/ChangeLog
index ff3142de8..39bf90ae6 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,8 @@ $Source$
 2003-03-21 Michal Cihar  <nijel@users.sourceforge.net>
     * ldi_check.php3: Use $sql_query instead of $query to put query correctly
       to sql.php3.
+    * libraries/display_export.lib.php3: Again fixed selecting table/db
+      filename template.
 
 2003-03-20 Marc Delisle  <lem9@users.sourceforge.net>
     * lang/hebrew update, thanks to Yuval Sarna
diff --git a/libraries/display_export.lib.php3 b/libraries/display_export.lib.php3
index ffa56b05c..ac65345ce 100644
--- a/libraries/display_export.lib.php3
+++ b/libraries/display_export.lib.php3
@@ -224,7 +224,7 @@ if (isset($table) && !empty($table) && !isset($num_tables)) {
                 <input type="text" name="filename_template"
                 <?php 
                     echo ' value="';
-                    if (isset($multi_tables) && $multi_tables != '') {
+                    if ((isset($multi_tables) && $multi_tables != '') || (!isset($table))) {
                         if (isset($_COOKIE) && !empty($_COOKIE['pma_db_filename_template'])) {
                             echo $_COOKIE['pma_db_filename_template'];
                         } elseif (isset($HTTP_COOKIE_VARS) && !empty($HTTP_COOKIE_VARS['pma_db_filename_template'])) {