diff --git a/ChangeLog b/ChangeLog
index 1803003d8..21736365f 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,7 +9,8 @@ $Source$
     * tbl_change.php: Fix XHTML and thus action selection behavior (bug
       #1376391).
     * lang/czech: Fix typo.
-    * tbl_select.php: Fix XHTML.
+    * tbl_select.php, libraries/display_tbl.lib.php,
+      tbl_properties_operations.php, tbl_indexes.php: Fix XHTML.
     * tbl_properties_export.php: Fix output before headers.
 
 2005-12-08 Sebastian Mendel <cybot_tm@users.sourceforge.net>
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index 9425af768..74b935225 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -372,7 +372,7 @@ function PMA_displayTableNavigation($pos_next, $pos_prev, $encoded_query)
    </td>
    <td>
         <?php //<form> for keep the form alignment of button < and << ?>
-        <form>
+        <form action="none">
         <?php echo PMA_pageselector(
                      'sql.php?sql_query='        . $encoded_query .
                         '&amp;session_max_rows=' . $session_max_rows .
diff --git a/tbl_indexes.php b/tbl_indexes.php
index ffaf682a4..55b7b8783 100644
--- a/tbl_indexes.php
+++ b/tbl_indexes.php
@@ -398,6 +398,9 @@ else if (!defined('PMA_IDX_INCLUDED')
         onsubmit="return checkFormElementInRange(this, 'idx_num_fields',
             '<?php echo str_replace('\'', '\\\'', $GLOBALS['strInvalidColumnCount']); ?>',
             1)">
+    <?php
+    echo PMA_generate_common_hidden_inputs( $db, $table );
+    ?>
     <table id="table_indexes" class="data">
         <caption class="tblHeaders">
         <?php
@@ -408,7 +411,6 @@ else if (!defined('PMA_IDX_INCLUDED')
 
         </caption>
     <?php
-    echo PMA_generate_common_hidden_inputs( $db, $table );
 
     if ( count($ret_keys) > 0) {
         $edit_link_text = '';
diff --git a/tbl_properties_operations.php b/tbl_properties_operations.php
index 734e10216..86bb80ac8 100644
--- a/tbl_properties_operations.php
+++ b/tbl_properties_operations.php
@@ -299,10 +299,10 @@ if (strstr($show_comment, '; InnoDB free') === false) {
     </tr>
 
     <!-- Table comments -->
-    <input type="hidden" name="prev_comment" value="<?php echo urlencode($comment); ?>" />
     <tr><td><?php echo $strTableComments; ?></td>
         <td><input type="text" name="comment" maxlength="60" size="30"
                 value="<?php echo htmlspecialchars($comment); ?>" onfocus="this.select()" />
+            <input type="hidden" name="prev_comment" value="<?php echo urlencode($comment); ?>" />
         </td>
     </tr>