diff --git a/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-collection.hbs b/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-collection.hbs
index c9e18bfd767..d52ec3e195d 100644
--- a/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-collection.hbs
+++ b/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-collection.hbs
@@ -1,11 +1,5 @@
 {{#if this.collection.content.length}}
-  <ul
-    class="select-kit-collection"
-    aria-live="polite"
-    role="menu"
-    {{did-insert this.lock}}
-    {{will-destroy this.unlock}}
-  >
+  <ul class="select-kit-collection" aria-live="polite" role="menu">
     {{#each this.collection.content as |item index|}}
       {{component
         (component-for-row this.collection.identifier item this.selectKit)
diff --git a/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-collection.js b/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-collection.js
index fc47d36e946..7c21ad8a61f 100644
--- a/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-collection.js
+++ b/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-collection.js
@@ -1,31 +1,5 @@
-import { cached } from "@glimmer/tracking";
 import Component from "@ember/component";
-import { action } from "@ember/object";
 import { tagName } from "@ember-decorators/component";
-import {
-  disableBodyScroll,
-  enableBodyScroll,
-} from "discourse/lib/body-scroll-lock";
 
 @tagName("")
-export default class SelectKitCollection extends Component {
-  @cached
-  get inModal() {
-    const element = this.selectKit.mainElement();
-    return element.closest(".d-modal");
-  }
-
-  @action
-  lock(element) {
-    if (!this.inModal) {
-      return;
-    }
-
-    disableBodyScroll(element);
-  }
-
-  @action
-  unlock(element) {
-    enableBodyScroll(element);
-  }
-}
+export default class SelectKitCollection extends Component {}
diff --git a/app/assets/stylesheets/common/components/add-pm-participants.scss b/app/assets/stylesheets/common/components/add-pm-participants.scss
index ea1d713b171..241c87d2766 100644
--- a/app/assets/stylesheets/common/components/add-pm-participants.scss
+++ b/app/assets/stylesheets/common/components/add-pm-participants.scss
@@ -1,3 +1,9 @@
+.d-modal.add-pm-participants {
+  .d-modal__body {
+    overflow-y: visible;
+  }
+}
+
 .add-pm-participants.modal .share.modal-panel {
   .header {
     display: flex;
diff --git a/app/assets/stylesheets/mobile/modal-overrides.scss b/app/assets/stylesheets/mobile/modal-overrides.scss
index a84397440ee..3c550539fc5 100644
--- a/app/assets/stylesheets/mobile/modal-overrides.scss
+++ b/app/assets/stylesheets/mobile/modal-overrides.scss
@@ -19,12 +19,6 @@
   }
 }
 
-.d-modal.add-pm-participants {
-  .d-modal__body {
-    overflow: visible;
-  }
-}
-
 .d-modal.bookmark-reminder-modal {
   .d-modal__container {
     min-height: calc(var(--composer-vh, var(--1dvh)) * 85);