diff --git a/ChangeLog b/ChangeLog
index 17691b7a9..7b8b8d8f6 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,7 @@ $Source$
       HTML entities.
     * libraries/build_dump.lib.php3: Removed PMA_htmlFormat function as it
       caused HTML entities to be quoted twice.
+    * tbl_indexes.php3: Fixed editing of index with HTML entities.
 
 2003-03-23 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/sqlparser.lib.php3, libraries/config_import.lib.php3,
diff --git a/tbl_indexes.php3 b/tbl_indexes.php3
index d4adce947..b1ea5f5d1 100644
--- a/tbl_indexes.php3
+++ b/tbl_indexes.php3
@@ -290,7 +290,7 @@ else if (!defined('PMA_IDX_INCLUDED')
     }
     echo "\n";
     ?>
-    <input type="hidden" name="old_index" value="<?php echo (isset($create_index) ? '' : $old_index); ?>" />
+    <input type="hidden" name="old_index" value="<?php echo (isset($create_index) ? '' : htmlspecialchars($old_index)); ?>" />
     <b><?php echo '------ ' . (isset($create_index) ? $strCreateIndexTopic : $strModifyIndexTopic) . ' ------'; ?></b>
     <br /><br />
 
@@ -472,7 +472,7 @@ else if (!defined('PMA_IDX_INCLUDED')
                     echo '        </tr>' . "\n";
                 } else {
                     echo '            <td bgcolor="' . $cell_bgd . '" colspan="2">' . "\n"
-                         . '                ' . $indexes_data[$index_name][$seq_index]['Column_name'] . "\n"
+                         . '                ' . htmlspecialchars($indexes_data[$index_name][$seq_index]['Column_name']) . "\n"
                          . '            </td>' . "\n";
                     echo '        </tr>' . "\n";
                 }