diff --git a/app/assets/javascripts/discourse/app/components/bulk-select-toggle.gjs b/app/assets/javascripts/discourse/app/components/bulk-select-toggle.gjs
index 31c6c2e67ec..f22da927698 100644
--- a/app/assets/javascripts/discourse/app/components/bulk-select-toggle.gjs
+++ b/app/assets/javascripts/discourse/app/components/bulk-select-toggle.gjs
@@ -1,8 +1,6 @@
 import DButton from "discourse/components/d-button";
-import bodyClass from "discourse/helpers/body-class";
 
 const BulkSelectToggle = <template>
-  {{bodyClass (if @bulkSelectHelper.bulkSelectEnabled "bulk-select-enabled")}}
   <DButton
     class="btn-default bulk-select"
     @action={{@bulkSelectHelper.toggleBulkSelect}}
diff --git a/app/assets/javascripts/discourse/app/components/topic-list/list.gjs b/app/assets/javascripts/discourse/app/components/topic-list/list.gjs
index bc9fa463585..20970533a5e 100644
--- a/app/assets/javascripts/discourse/app/components/topic-list/list.gjs
+++ b/app/assets/javascripts/discourse/app/components/topic-list/list.gjs
@@ -185,7 +185,7 @@ export default class TopicList extends Component {
     <table
       class={{concatClass
         "topic-list"
-        (if this.bulkSelectEnabled "sticky-header")
+        (if this.bulkSelectEnabled "sticky-header bulk-select-enabled")
         this.additionalClasses
       }}
     >