diff --git a/ChangeLog b/ChangeLog
index 40b3f36cc..1867c33ba 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2005-05-11 Marc Delisle  <lem9@users.sourceforge.net>
+    * tbl_properties.inc.php: bug #1069012, table collation forgotten
+      when adding fields
+
 2005-05-10 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/sqlparser.lib.php: bug #1198156, undefined variable
       when exporting without enclosing with backquotes
diff --git a/tbl_properties.inc.php b/tbl_properties.inc.php
index 2f00ea941..01661b296 100644
--- a/tbl_properties.inc.php
+++ b/tbl_properties.inc.php
@@ -669,7 +669,7 @@ if ($action == 'tbl_create.php') {
         if (PMA_MYSQL_INT_VERSION >= 40100) {
             echo '        <td width="25">&nbsp;</td>' . "\n"
                . '        <td>' . "\n"
-               . PMA_generateCharsetDropdownBox(PMA_CSDROPDOWN_COLLATION, 'tbl_collation', NULL, NULL, FALSE, 3)
+               . PMA_generateCharsetDropdownBox(PMA_CSDROPDOWN_COLLATION, 'tbl_collation', NULL, (isset($tbl_collation) ? $tbl_collation : NULL), FALSE, 3)
                . '        </td>' . "\n";
         }
     }