diff --git a/netbox/templates/generic/object_list.html b/netbox/templates/generic/object_list.html
index 0d61e58b7..a89c5a960 100644
--- a/netbox/templates/generic/object_list.html
+++ b/netbox/templates/generic/object_list.html
@@ -81,19 +81,7 @@ Context:
         {% if table.paginator.num_pages > 1 %}
           <div id="select-all-box" class="d-none card d-print-none">
             <div class="form col-md-12">
-              <div class="card-body">
-                <div class="float-end">
-                  {% if 'bulk_edit' in actions %}
-                    <span class="bulk-edit-button">
-                    {% bulk_edit_button model query_params=request.GET %}
-                    </span>
-                  {% endif %}
-                  {% if 'bulk_delete' in actions %}
-                    <span class="bulk-delete-button">
-                    {% bulk_delete_button model query_params=request.GET %}
-                    </span>
-                  {% endif %}
-                </div>
+              <div class="card-body d-flex justify-content-between">
                 <div class="form-check">
                   <input type="checkbox" id="select-all" name="_all" class="form-check-input" />
                   <label for="select-all" class="form-check-label">
@@ -102,6 +90,14 @@ Context:
                     {% endblocktrans %}
                   </label>
                 </div>
+                <div class="bulk-action-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>
             </div>
           </div>
@@ -127,12 +123,14 @@ Context:
           {# Form buttons #}
           <div class="btn-list d-print-none mt-2">
             {% 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 class="bulk-action-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>
             {% endblock %}
           </div>
           {# /Form buttons #}
diff --git a/netbox/templates/htmx/table.html b/netbox/templates/htmx/table.html
index ae480a1cf..5728789fa 100644
--- a/netbox/templates/htmx/table.html
+++ b/netbox/templates/htmx/table.html
@@ -15,16 +15,19 @@
   {% endwith %}
 </div>
 
-{# Include the updated object count for display elsewhere on the page #}
-<div class="d-none" hx-swap-oob="innerHTML:.total-object-count">{{ table.rows|length }}</div>
-{% if 'bulk_edit' in actions %}
-  <div class="d-none" hx-swap-oob="innerHTML:.bulk-edit-button">
-  {% bulk_edit_button model query_params=request.GET %}
-  </div>
-{% endif %}
-{% if 'bulk_delete' in actions %}
-  <div class="d-none" hx-swap-oob="innerHTML:.bulk-delete-button">
-  {% bulk_delete_button model query_params=request.GET %}
-  </div>
-{% endif %}
+{% if request.htmx %}
+  {# Include the updated object count for display elsewhere on the page #}
+  <div hx-swap-oob="innerHTML:.total-object-count">{{ table.rows|length }}</div>
 
+  {# Update the bulk action buttons with new query parameters #}
+  {% if actions %}
+    <div class="bulk-action-buttons" hx-swap-oob="outerHTML:.bulk-action-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>
+  {% endif %}
+{% endif %}