diff --git a/ChangeLog b/ChangeLog
index 49b70f0f5..31b99e6d2 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@ $Source$
 2004-09-29 Marc Delisle  <lem9@users.sourceforge.net>
     * sql.php, libraries/common.lib.php: bug #1036678, incorrect appending
       of LIMIT to queries, and bug #1037004, UPDATE statement not showing
+    * tbl_properties_operations.php: bug #1035524, cannot add comments to table
 
 2004-09-29 Michal Čihař  <michal@cihar.com>
     * tbl_addfield.php, tbl_create.php, tbl_properties.inc.php, lang/*: Better
diff --git a/tbl_properties_operations.php b/tbl_properties_operations.php
index ae11b4e17..3eb47fd8b 100644
--- a/tbl_properties_operations.php
+++ b/tbl_properties_operations.php
@@ -22,6 +22,10 @@ $cfgRelation = PMA_getRelationsParam();
  */
 require_once('./libraries/mysql_charsets.lib.php');
 
+// reselect current db (needed in some cases probably due to
+// the calling of relation.lib.php)
+PMA_DBI_select_db($db);
+
 /**
  * Updates table comment, type and options if required
  */