diff --git a/netbox/templates/generic/object_list.html b/netbox/templates/generic/object_list.html
index 60eba6097..272c1598e 100644
--- a/netbox/templates/generic/object_list.html
+++ b/netbox/templates/generic/object_list.html
@@ -67,64 +67,65 @@ Context:
         {% applied_filters filter_form request.GET %}
       {% endif %}
 
-      {# "Select all" form #}
-      {% if table.paginator.num_pages > 1 %}
-        <div id="select-all-box" class="d-none card noprint">
-          <form method="post" class="form col-md-12">
-            {% csrf_token %}
-            <div class="card-body">
-              <div class="float-end">
+      <form method="post" class="form form-horizontal">
+        {% csrf_token %}
+        {# "Select all" form #}
+        {% if table.paginator.num_pages > 1 %}
+          <div id="select-all-box" class="d-none card noprint">
+            <div class="form col-md-12">
+              <div class="card-body">
+                <div class="float-end">
+                  {% if 'bulk_edit' in actions %}
+                    {% bulk_edit_button model query_params=request.GET %}
+                  {% endif %}
+                  {% if 'bulk_delete' in actions %}
+                    {% bulk_delete_button model query_params=request.GET %}
+                  {% endif %}
+                </div>
+                <div class="form-check">
+                  <input type="checkbox" id="select-all" name="_all" class="form-check-input" />
+                  <label for="select-all" class="form-check-label">
+                    Select <strong>all {{ table.rows|length }} {{ table.data.verbose_name_plural }}</strong> matching query
+                  </label>
+                </div>
+              </div>
+            </div>
+          </div>
+        {% endif %}
+
+        {# Object table controls #}
+        {% include 'inc/table_controls_htmx.html' with table_modal="ObjectTable_config" %}
+
+        <div class="form form-horizontal">
+          {% csrf_token %}
+          <input type="hidden" name="return_url" value="{% if return_url %}{{ return_url }}{% else %}{{ request.path }}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}{% endif %}" />
+
+          {# Object table #}
+
+              {% if prerequisite_model %}
+                {% include 'inc/missing_prerequisites.html' %}
+              {% endif %}
+
+          <div class="card">
+            <div class="card-body" id="object_list">
+              {% include 'htmx/table.html' %}
+            </div>
+          </div>
+
+          {# Form buttons #}
+          <div class="noprint bulk-buttons">
+            <div class="bulk-button-group">
+              {% block bulk_buttons %}
                 {% if 'bulk_edit' in actions %}
                   {% bulk_edit_button model query_params=request.GET %}
                 {% endif %}
                 {% if 'bulk_delete' in actions %}
                   {% bulk_delete_button model query_params=request.GET %}
                 {% endif %}
-              </div>
-              <div class="form-check">
-                <input type="checkbox" id="select-all" name="_all" class="form-check-input" />
-                <label for="select-all" class="form-check-label">
-                  Select <strong>all {{ table.rows|length }} {{ table.data.verbose_name_plural }}</strong> matching query
-                </label>
-              </div>
+              {% endblock %}
             </div>
-          </form>
-        </div>
-      {% endif %}
-
-      {# Object table controls #}
-      {% include 'inc/table_controls_htmx.html' with table_modal="ObjectTable_config" %}
-
-      <form method="post" class="form form-horizontal">
-        {% csrf_token %}
-        <input type="hidden" name="return_url" value="{% if return_url %}{{ return_url }}{% else %}{{ request.path }}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}{% endif %}" />
-
-        {# Object table #}
-
-            {% if prerequisite_model %}
-              {% include 'inc/missing_prerequisites.html' %}
-            {% endif %}
-
-        <div class="card">
-          <div class="card-body" id="object_list">
-            {% include 'htmx/table.html' %}
           </div>
         </div>
-
-        {# Form buttons #}
-        <div class="noprint bulk-buttons">
-          <div class="bulk-button-group">
-            {% block bulk_buttons %}
-              {% if 'bulk_edit' in actions %}
-                {% bulk_edit_button model query_params=request.GET %}
-              {% endif %}
-              {% if 'bulk_delete' in actions %}
-                {% bulk_delete_button model query_params=request.GET %}
-              {% endif %}
-            {% endblock %}
-          </div>
-        </div>
-
       </form>
 
     </div>