diff --git a/netbox/netbox/views/generic/bulk_views.py b/netbox/netbox/views/generic/bulk_views.py
index bc6ace885..e6a09db07 100644
--- a/netbox/netbox/views/generic/bulk_views.py
+++ b/netbox/netbox/views/generic/bulk_views.py
@@ -176,6 +176,8 @@ class ObjectListView(BaseMultiObjectView, ActionsMixin, TableMixin):
                     table.columns.hide('pk')
             return render(request, 'htmx/table.html', {
                 'table': table,
+                'model': model,
+                'actions': actions,
             })
 
         context = {
diff --git a/netbox/templates/generic/object_list.html b/netbox/templates/generic/object_list.html
index af7a07dfd..0d61e58b7 100644
--- a/netbox/templates/generic/object_list.html
+++ b/netbox/templates/generic/object_list.html
@@ -84,14 +84,14 @@ Context:
               <div class="card-body">
                 <div class="float-end">
                   {% if 'bulk_edit' in actions %}
-                    <div class="bulk-edit-button">
+                    <span class="bulk-edit-button">
                     {% bulk_edit_button model query_params=request.GET %}
-                    </div>
+                    </span>
                   {% endif %}
                   {% if 'bulk_delete' in actions %}
-                    <div class="bulk-delete-button">
+                    <span class="bulk-delete-button">
                     {% bulk_delete_button model query_params=request.GET %}
-                    </div>
+                    </span>
                   {% endif %}
                 </div>
                 <div class="form-check">