diff --git a/netbox/templates/generic/object_list.html b/netbox/templates/generic/object_list.html
index 5f73eb0cd..7b837dd23 100644
--- a/netbox/templates/generic/object_list.html
+++ b/netbox/templates/generic/object_list.html
@@ -30,31 +30,29 @@
 {% if table.paginator.num_pages > 1 %}
 {% with bulk_edit_url=content_type.model_class|validated_viewname:"bulk_edit" bulk_delete_url=content_type.model_class|validated_viewname:"bulk_delete" %}
   <div id="select-all-box" class="d-none card noprint">
-    <div class="row mb-3">
-      <form method="post" class="form col-md-12">
-        {% csrf_token %}
-        <div class="card-body d-inline-flex justify-content-between align-items-center">
-          <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 class="float-end">
-            {% if bulk_edit_url and permissions.change %}
-              <button type="submit" name="_edit" formaction="{% url bulk_edit_url %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="btn btn-warning btn-sm" disabled>
-                <span class="mdi mdi-pencil" aria-hidden="true"></span> Edit All
-              </button>
-            {% endif %}
-            {% if bulk_delete_url and permissions.delete %}
-              <button type="submit" name="_delete" formaction="{% url bulk_delete_url %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="btn btn-danger btn-sm" disabled>
-                <span class="mdi mdi-trash-can-outline" aria-hidden="true"></span> Delete All
-              </button>
-            {% endif %}
-          </div>
+    <form method="post" class="form col-md-12">
+      {% csrf_token %}
+      <div class="card-body">
+        <div class="float-end">
+          {% if bulk_edit_url and permissions.change %}
+            <button type="submit" name="_edit" formaction="{% url bulk_edit_url %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="btn btn-warning btn-sm" disabled>
+              <span class="mdi mdi-pencil" aria-hidden="true"></span> Edit All
+            </button>
+          {% endif %}
+          {% if bulk_delete_url and permissions.delete %}
+            <button type="submit" name="_delete" formaction="{% url bulk_delete_url %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="btn btn-danger btn-sm" disabled>
+              <span class="mdi mdi-trash-can-outline" aria-hidden="true"></span> Delete All
+            </button>
+          {% endif %}
         </div>
-      </form>
-    </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>
+    </form>
   </div>
 {% endwith %}
 {% endif %}
diff --git a/netbox/templates/utilities/obj_table.html b/netbox/templates/utilities/obj_table.html
index d87c09f90..ad14de48d 100644
--- a/netbox/templates/utilities/obj_table.html
+++ b/netbox/templates/utilities/obj_table.html
@@ -4,14 +4,8 @@
         {% 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 %}" />
         {% if table.paginator.num_pages > 1 %}
-            <div id="select_all_box" class="hidden card noprint">
+            <div id="select-all-box" class="d-none card noprint">
                 <div class="card-body">
-                    <div class="checkbox-inline">
-                        <label for="select_all">
-                            <input type="checkbox" id="select_all" name="_all" />
-                            Select <strong>all {{ table.rows|length }} {{ table.data.verbose_name_plural }}</strong> matching query
-                        </label>
-                    </div>
                     <div class="float-end">
                         {% if bulk_edit_url and permissions.change %}
                             <button type="submit" name="_edit" formaction="{% url bulk_edit_url %}{% if bulk_querystring %}?{{ bulk_querystring }}{% elif request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="btn btn-warning btn-sm" disabled="disabled">
@@ -24,6 +18,12 @@
                             </button>
                         {% 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>
         {% endif %}