From 0c1627c69ac2f853d6bd316534f6fe3cac82a713 Mon Sep 17 00:00:00 2001
From: Paul Bottein <paul.bottein@gmail.com>
Date: Thu, 11 Dec 2025 13:16:17 +0100
Subject: [PATCH] Fix area and floor picker search (#28494)

---
 src/components/ha-area-picker.ts  | 8 ++++----
 src/components/ha-floor-picker.ts | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/components/ha-area-picker.ts b/src/components/ha-area-picker.ts
index 727a23ad1c..6a779119b0 100644
--- a/src/components/ha-area-picker.ts
+++ b/src/components/ha-area-picker.ts
@@ -31,10 +31,10 @@ import "./ha-svg-icon";
 const ADD_NEW_ID = "___ADD_NEW___";
 
 const SEARCH_KEYS = [
-  { name: "areaName", weight: 10 },
-  { name: "aliases", weight: 8 },
-  { name: "floorName", weight: 6 },
-  { name: "id", weight: 3 },
+  { name: "search_labels.areaName", weight: 10 },
+  { name: "search_labels.aliases", weight: 8 },
+  { name: "search_labels.floorName", weight: 6 },
+  { name: "search_labels.id", weight: 3 },
 ];
 @customElement("ha-area-picker")
 export class HaAreaPicker extends LitElement {
diff --git a/src/components/ha-floor-picker.ts b/src/components/ha-floor-picker.ts
index 13bde5b212..8bcb37a494 100644
--- a/src/components/ha-floor-picker.ts
+++ b/src/components/ha-floor-picker.ts
@@ -36,9 +36,9 @@ import "./ha-svg-icon";
 const ADD_NEW_ID = "___ADD_NEW___";
 
 const SEARCH_KEYS = [
-  { name: "floorName", weight: 10 },
-  { name: "aliases", weight: 8 },
-  { name: "floor_id", weight: 3 },
+  { name: "search_labels.floorName", weight: 10 },
+  { name: "search_labels.aliases", weight: 8 },
+  { name: "search_labels.floor_id", weight: 3 },
 ];
 
 interface FloorComboBoxItem extends PickerComboBoxItem {