diff --git a/templates/database/structure/structure_table_row.twig b/templates/database/structure/structure_table_row.twig
index f01487f51d..cd82874047 100644
--- a/templates/database/structure/structure_table_row.twig
+++ b/templates/database/structure/structure_table_row.twig
@@ -209,16 +209,30 @@
     {% else %}
 
         {% if db_is_system_schema %}
-            {% set action_colspan = 3 %}
+            {% set action_colspan = 2 %}
         {% else %}
-            {% set action_colspan = 6 %}
+            {% set action_colspan = 4 %}
         {% endif %}
         {% if num_favorite_tables > 0 %}
             {% set action_colspan = action_colspan + 1 %}
         {% endif %}
+        {% if show_charset %}
+            {% set action_colspan = action_colspan + 1 %}
+        {% endif %}
+        {% if show_comment %}
+            {% set action_colspan = action_colspan + 1 %}
+        {% endif %}
+        {% if show_creation %}
+            {% set action_colspan = action_colspan + 1 %}
+        {% endif %}
+        {% if show_last_update %}
+            {% set action_colspan = action_colspan + 1 %}
+        {% endif %}
+        {% if show_last_check %}
+            {% set action_colspan = action_colspan + 1 %}
+        {% endif %}
 
-        {% set colspan_for_structure = action_colspan + 3 %}
-        <td colspan="{{ colspan_for_structure - db_is_system_schema ? 6 : 9 }}"
+        <td colspan="{{ action_colspan }}"
             class="text-center">
             {% trans 'in use' %}
         </td>