diff --git a/templates/database/structure/bulk_action_modal.twig b/templates/database/structure/bulk_action_modal.twig
new file mode 100644
index 0000000000..36edbed5be
--- /dev/null
+++ b/templates/database/structure/bulk_action_modal.twig
@@ -0,0 +1,16 @@
+<div class="modal fade" id="bulkActionModal" data-bs-backdrop="static" data-bs-keyboard="false"
+     tabindex="-1" aria-labelledby="bulkActionLabel" aria-hidden="true">
+  <div class="modal-dialog modal-dialog-centered">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title" id="bulkActionLabel"></h5>
+        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="{% trans 'Cancel' %}"></button>
+      </div>
+      <div class="modal-body"></div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{% trans 'Cancel' %}</button>
+        <button type="button" class="btn btn-primary" id="bulkActionContinue">{% trans 'Continue' %}</button>
+      </div>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/templates/database/structure/check_all_tables.twig b/templates/database/structure/check_all_tables.twig
index ac14dafc90..da94978829 100644
--- a/templates/database/structure/check_all_tables.twig
+++ b/templates/database/structure/check_all_tables.twig
@@ -39,23 +39,6 @@
     {{ hidden_fields|join('\n')|raw }}
 </div>
 
-<div class="modal fade" id="bulkActionModal" data-bs-backdrop="static" data-bs-keyboard="false"
-     tabindex="-1" aria-labelledby="bulkActionLabel" aria-hidden="true">
-  <div class="modal-dialog modal-dialog-centered">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title" id="bulkActionLabel"></h5>
-        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="{% trans 'Cancel' %}"></button>
-      </div>
-      <div class="modal-body"></div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{% trans 'Cancel' %}</button>
-        <button type="button" class="btn btn-primary" id="bulkActionContinue">{% trans 'Continue' %}</button>
-      </div>
-    </div>
-  </div>
-</div>
-
 {% if central_columns_work is defined and central_columns_work %}
   <div class="modal fade" id="makeConsistentWithCentralListModal" data-bs-backdrop="static" data-bs-keyboard="false"
        tabindex="-1" aria-labelledby="makeConsistentWithCentralListModalLabel" aria-hidden="true">
diff --git a/templates/database/structure/table_header.twig b/templates/database/structure/table_header.twig
index 2490cf70b0..15c1f71b37 100644
--- a/templates/database/structure/table_header.twig
+++ b/templates/database/structure/table_header.twig
@@ -72,7 +72,10 @@
     {% endif %}
 </table>
 </div>
+{% if check_all_tables %}
+  {% include 'database/structure/check_all_tables.twig' with check_all_tables only %}
+{% endif %}
 </form>
 {% if check_all_tables %}
-    {% include 'database/structure/check_all_tables.twig' with check_all_tables only %}
+  {% include 'database/structure/bulk_action_modal.twig' with check_all_tables only %}
 {% endif %}