From 7f880d11a099a102277eba47af697a43a6c489fc Mon Sep 17 00:00:00 2001
From: Marcin Bauer <marcinbauer85@gmail.com>
Date: Mon, 2 Feb 2026 13:45:54 +0100
Subject: [PATCH] Keep focus on search field when clicking filter chips
 (#29249)

Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>
---
 src/components/ha-picker-combo-box.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/components/ha-picker-combo-box.ts b/src/components/ha-picker-combo-box.ts
index b0717a55d0..039ed64944 100644
--- a/src/components/ha-picker-combo-box.ts
+++ b/src/components/ha-picker-combo-box.ts
@@ -22,6 +22,7 @@ import {
 import { haStyleScrollbar } from "../resources/styles";
 import { loadVirtualizer } from "../resources/virtualizer";
 import type { HomeAssistant } from "../types";
+import { isTouch } from "../util/is_touch";
 import "./chips/ha-chip-set";
 import "./chips/ha-filter-chip";
 import "./ha-combo-box-item";
@@ -284,6 +285,7 @@ export class HaPickerComboBox extends ScrollableFadeMixin(LitElement) {
           section === "separator"
             ? html`<div class="separator"></div>`
             : html`<ha-filter-chip
+                @mousedown=${isTouch ? undefined : this._preventBlur}
                 @click=${this._toggleSection}
                 .section-id=${section.id}
                 .selected=${this._selectedSection === section.id}
@@ -506,6 +508,10 @@ export class HaPickerComboBox extends ScrollableFadeMixin(LitElement) {
     this._valuePinned = true;
   };
 
+  private _preventBlur(ev: Event) {
+    ev.preventDefault();
+  }
+
   private _toggleSection(ev: Event) {
     ev.stopPropagation();
     this._resetSelectedItem();