From 78d7da21aaa283e5ef60e238032a5d719185e7e4 Mon Sep 17 00:00:00 2001
From: Paul Bottein <paul.bottein@gmail.com>
Date: Tue, 10 Jun 2025 16:46:09 +0200
Subject: [PATCH] Fix custom value selected when clicking item in combo box
 (#25734)

---
 src/components/ha-combo-box.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/ha-combo-box.ts b/src/components/ha-combo-box.ts
index 58ed2e1f51..ab5ecfe4c3 100644
--- a/src/components/ha-combo-box.ts
+++ b/src/components/ha-combo-box.ts
@@ -345,8 +345,10 @@ export class HaComboBox extends LitElement {
       // @ts-ignore
       this._comboBox._closeOnBlurIsPrevented = true;
     }
+    if (!this.opened) {
+      return;
+    }
     const newValue = ev.detail.value;
-
     if (newValue !== this.value) {
       fireEvent(this, "value-changed", { value: newValue || undefined });
     }