diff --git a/netbox/netbox/views/generic/bulk_views.py b/netbox/netbox/views/generic/bulk_views.py
index 548e945d1..69c0046aa 100644
--- a/netbox/netbox/views/generic/bulk_views.py
+++ b/netbox/netbox/views/generic/bulk_views.py
@@ -152,8 +152,7 @@ class ObjectListView(BaseMultiObjectView, ActionsMixin, TableMixin):
 
         # Determine the available actions
         actions = self.get_permitted_actions(request.user)
-        # has_bulk_actions = any([a.startswith('bulk_') for a in actions])
-        has_bulk_actions = True
+        has_bulk_actions = any(action.bulk for action in actions.values())
 
         if 'export' in request.GET:
 
diff --git a/netbox/netbox/views/generic/object_views.py b/netbox/netbox/views/generic/object_views.py
index 7ac2e7b11..bfd9d1143 100644
--- a/netbox/netbox/views/generic/object_views.py
+++ b/netbox/netbox/views/generic/object_views.py
@@ -143,8 +143,7 @@ class ObjectChildrenView(ObjectView, ActionsMixin, TableMixin):
 
         # Determine the available actions
         actions = self.get_permitted_actions(request.user, model=self.child_model)
-        # has_bulk_actions = any([a.startswith('bulk_') for a in actions])
-        has_bulk_actions = True
+        has_bulk_actions = any(a.bulk for a in actions)
 
         table_data = self.prep_table_data(request, child_objects, instance)
         table = self.get_table(table_data, request, has_bulk_actions)