diff --git a/assets/javascripts/discourse/connectors/composer-fields/persona-selector.gjs b/assets/javascripts/discourse/connectors/composer-fields/persona-selector.gjs
index 0209aa81..2116872c 100644
--- a/assets/javascripts/discourse/connectors/composer-fields/persona-selector.gjs
+++ b/assets/javascripts/discourse/connectors/composer-fields/persona-selector.gjs
@@ -66,6 +66,10 @@ export default class BotSelector extends Component {
     }
   }
 
+  get filterable() {
+    return this.botOptions.length > 4;
+  }
+
   get value() {
     return this._value;
   }
@@ -82,7 +86,7 @@ export default class BotSelector extends Component {
         class="persona-selector__dropdown"
         @value={{this.value}}
         @content={{this.botOptions}}
-        @options={{hash icon="robot"}}
+        @options={{hash icon="robot" filterable=this.filterable}}
       />
     </div>
   </template>
diff --git a/assets/stylesheets/modules/ai-bot/common/bot-replies.scss b/assets/stylesheets/modules/ai-bot/common/bot-replies.scss
index b712c8e1..4943b9bf 100644
--- a/assets/stylesheets/modules/ai-bot/common/bot-replies.scss
+++ b/assets/stylesheets/modules/ai-bot/common/bot-replies.scss
@@ -12,6 +12,9 @@ nav.post-controls .actions button.cancel-streaming {
   .gpt-persona {
     margin-bottom: 5px;
     margin-top: -10px;
+    .select-kit.single-select.dropdown-select-box ul.select-kit-collection {
+      max-height: 200px;
+    }
   }
 }