diff --git a/packages/ui/src/components/base/ManySelect.vue b/packages/ui/src/components/base/ManySelect.vue
index 85671398e7..90454ccd0c 100644
--- a/packages/ui/src/components/base/ManySelect.vue
+++ b/packages/ui/src/components/base/ManySelect.vue
@@ -31,7 +31,7 @@
             "
           />
         </div>
-        <ScrollablePanel v-if="search" class="h-[17rem]">
+        <ScrollablePanel v-if="search">
           <Button
             v-for="(option, index) in filteredOptions"
             :key="`option-${index}`"
diff --git a/packages/ui/src/components/base/ScrollablePanel.vue b/packages/ui/src/components/base/ScrollablePanel.vue
index 20323f39df..65e92aadc7 100644
--- a/packages/ui/src/components/base/ScrollablePanel.vue
+++ b/packages/ui/src/components/base/ScrollablePanel.vue
@@ -113,6 +113,7 @@ function onScroll({ target: { scrollTop, offsetHeight, scrollHeight } }) {
   overflow-y: auto;
   overflow-x: hidden;
   position: relative;
+  max-height: 19rem;
 
   ::-webkit-scrollbar {
     transition: all;