diff --git a/libraries/display_structure.inc.php b/libraries/display_structure.inc.php
index 47db3a2a8c..50387d8096 100644
--- a/libraries/display_structure.inc.php
+++ b/libraries/display_structure.inc.php
@@ -229,9 +229,6 @@ $response->addHTML('</div>');
 if (! $tbl_is_view && ! $db_is_system_schema) {
     $response->addHTML('<br />');
     $response->addHTML(PMA_getHtmlForAddColumn($columns_list));
-    $response->addHTML(
-        '<div id="index_div" class="ajax" >'
-    );
 }
 
 /**
diff --git a/libraries/structure.lib.php b/libraries/structure.lib.php
index f7044dab06..e920a3757c 100644
--- a/libraries/structure.lib.php
+++ b/libraries/structure.lib.php
@@ -1803,9 +1803,7 @@ function getHtmlForRowStatsTable($showtable, $tbl_collation,
         );
     }
     $html_output .= '</tbody>'
-    . '</table>'
-    . '</fieldset>'
-    . '</div>';
+    . '</table>';
 
     return $html_output;
 }
@@ -2234,6 +2232,9 @@ function PMA_getHtmlForDisplayTableStats($showtable, $table_info_num_rows,
         (isset ($avg_size) ? $avg_size : ''),
         (isset ($avg_unit) ? $avg_unit : '')
     );
+    
+    $html_output .= '</fieldset>'
+        . '</div>';
 
     return $html_output;
 }