diff --git a/assets/javascripts/discourse/components/ai-search-discoveries.gjs b/assets/javascripts/discourse/components/ai-search-discoveries.gjs
index 892aa679..4dd14ef7 100644
--- a/assets/javascripts/discourse/components/ai-search-discoveries.gjs
+++ b/assets/javascripts/discourse/components/ai-search-discoveries.gjs
@@ -73,12 +73,12 @@ export default class AiSearchDiscoveries extends Component {
 
     withPluginApi((api) => {
       api.addSearchMenuOnKeyDownCallback((searchMenu, event) => {
-        if (!searchMenu || this.discobotDiscoveries.loadingDiscoveries) {
+        if (!searchMenu) {
           return;
         }
 
         if (this.discobotDiscoveries.lastQuery === this.query) {
-          return false;
+          return true;
         }
 
         if (event.key === "Enter" && this.query) {
@@ -158,6 +158,11 @@ export default class AiSearchDiscoveries extends Component {
     if (!personas) {
       return false;
     }
+
+    if (this.discobotDiscoveries.discoveryTimedOut) {
+      return false;
+    }
+
     const discoverPersona = personas.find(
       (persona) =>
         persona.id === parseInt(this.siteSettings?.ai_bot_discover_persona, 10)
@@ -252,9 +257,12 @@ export default class AiSearchDiscoveries extends Component {
   }
 
   timeoutDiscovery() {
+    if (this.discobotDiscoveries.discovery?.length > 0) {
+      return;
+    }
+
     this.discobotDiscoveries.loadingDiscoveries = false;
     this.discobotDiscoveries.discovery = "";
-
     this.discobotDiscoveries.discoveryTimedOut = true;
   }
 
diff --git a/assets/javascripts/discourse/services/discobot-discoveries.js b/assets/javascripts/discourse/services/discobot-discoveries.js
index a628f340..7813068c 100644
--- a/assets/javascripts/discourse/services/discobot-discoveries.js
+++ b/assets/javascripts/discourse/services/discobot-discoveries.js
@@ -21,7 +21,11 @@ export default class DiscobotDiscoveries extends Service {
   }
 
   get showDiscoveryTitle() {
-    return this.discovery.length > 0 || this.loadingDiscoveries;
+    return (
+      this.discovery.length > 0 ||
+      this.loadingDiscoveries ||
+      this.discoveryTimedOut
+    );
   }
 
   @action