From 55f22ba61aa91777a8e2d18d9295312aa2bddd5a Mon Sep 17 00:00:00 2001
From: Wendelin <12148533+wendevlin@users.noreply.github.com>
Date: Thu, 29 Jan 2026 17:41:12 +0100
Subject: [PATCH] Implement fallback for dialog close event in Quick Search
 (#29260)

---
 src/dialogs/quick-bar/ha-quick-bar.ts | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/dialogs/quick-bar/ha-quick-bar.ts b/src/dialogs/quick-bar/ha-quick-bar.ts
index c86b0108b6..99d094eb83 100644
--- a/src/dialogs/quick-bar/ha-quick-bar.ts
+++ b/src/dialogs/quick-bar/ha-quick-bar.ts
@@ -171,6 +171,18 @@ export class QuickBar extends LitElement {
     fireEvent(this, "dialog-closed", { dialog: this.localName });
   };
 
+  // fallback in case the closed event is not fired
+  private _dialogCloseStarted = () => {
+    setTimeout(
+      () => {
+        if (this._opened) {
+          this._dialogClosed();
+        }
+      },
+      350 // close animation timeout is 300ms
+    );
+  };
+
   // #endregion lifecycle
 
   // #region render
@@ -226,6 +238,7 @@ export class QuickBar extends LitElement {
         hideActions
         @wa-show=${this._showTriggered}
         @wa-after-show=${this._dialogOpened}
+        @wa-hide=${this._dialogCloseStarted}
         @closed=${this._dialogClosed}
       >
         ${!this._loading && this._opened