From 334e1c35e1ae02d1c7f7f11271b937c9dd0e0f33 Mon Sep 17 00:00:00 2001
From: Wendelin <12148533+wendevlin@users.noreply.github.com>
Date: Mon, 1 Dec 2025 12:04:15 +0100
Subject: [PATCH] Fix ha-bottom-sheet closed event (#28257)

---
 src/components/ha-bottom-sheet.ts   | 3 ++-
 src/components/ha-generic-picker.ts | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/ha-bottom-sheet.ts b/src/components/ha-bottom-sheet.ts
index a22d575bbc..62d0ca7b69 100644
--- a/src/components/ha-bottom-sheet.ts
+++ b/src/components/ha-bottom-sheet.ts
@@ -21,7 +21,8 @@ export class HaBottomSheet extends LitElement {
 
   private _isDragging = false;
 
-  private _handleAfterHide() {
+  private _handleAfterHide(afterHideEvent: Event) {
+    afterHideEvent.stopPropagation();
     this.open = false;
     const ev = new Event("closed", {
       bubbles: true,
diff --git a/src/components/ha-generic-picker.ts b/src/components/ha-generic-picker.ts
index a160b31ead..6f955cb7e2 100644
--- a/src/components/ha-generic-picker.ts
+++ b/src/components/ha-generic-picker.ts
@@ -248,7 +248,7 @@ export class HaGenericPicker extends LitElement {
     });
   };
 
-  private _hidePicker(ev) {
+  private _hidePicker(ev: Event) {
     ev.stopPropagation();
     if (this._newValue) {
       fireEvent(this, "value-changed", { value: this._newValue });