From 616237caeee955f11a1353da9b133e1c3f246ca4 Mon Sep 17 00:00:00 2001
From: Wendelin <12148533+wendevlin@users.noreply.github.com>
Date: Wed, 5 Nov 2025 14:56:58 +0100
Subject: [PATCH] Fix target picker with empty sections (#27813)

---
 src/components/target-picker/ha-target-picker-selector.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/target-picker/ha-target-picker-selector.ts b/src/components/target-picker/ha-target-picker-selector.ts
index b340e7d36c..94a3db5155 100644
--- a/src/components/target-picker/ha-target-picker-selector.ts
+++ b/src/components/target-picker/ha-target-picker-selector.ts
@@ -705,7 +705,7 @@ export class HaTargetPickerSelector extends LitElement {
           ) as EntityComboBoxItem[];
         }
 
-        if (!filterType) {
+        if (!filterType && entities.length) {
           // show group title
           items.push(
             this.hass.localize("ui.components.target-picker.type.entities")
@@ -733,7 +733,7 @@ export class HaTargetPickerSelector extends LitElement {
           devices = this._filterGroup("device", devices);
         }
 
-        if (!filterType) {
+        if (!filterType && devices.length) {
           // show group title
           items.push(
             this.hass.localize("ui.components.target-picker.type.devices")
@@ -769,7 +769,7 @@ export class HaTargetPickerSelector extends LitElement {
           ) as FloorComboBoxItem[];
         }
 
-        if (!filterType) {
+        if (!filterType && areasAndFloors.length) {
           // show group title
           items.push(
             this.hass.localize("ui.components.target-picker.type.areas")
@@ -811,7 +811,7 @@ export class HaTargetPickerSelector extends LitElement {
           labels = this._filterGroup("label", labels);
         }
 
-        if (!filterType) {
+        if (!filterType && labels.length) {
           // show group title
           items.push(
             this.hass.localize("ui.components.target-picker.type.labels")