From 9458946dcca7a31ad52b995a17f5579d418fb6b4 Mon Sep 17 00:00:00 2001
From: Paul Bottein <paul.bottein@gmail.com>
Date: Wed, 28 May 2025 13:06:45 +0200
Subject: [PATCH] Fix missing helper for entity picker (#25622)

---
 src/components/entity/ha-entity-picker.ts | 1 +
 src/components/ha-generic-picker.ts       | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/components/entity/ha-entity-picker.ts b/src/components/entity/ha-entity-picker.ts
index 8d29711e52..7803f079f7 100644
--- a/src/components/entity/ha-entity-picker.ts
+++ b/src/components/entity/ha-entity-picker.ts
@@ -397,6 +397,7 @@ export class HaEntityPicker extends LitElement {
         .autofocus=${this.autofocus}
         .allowCustomValue=${this.allowCustomEntity}
         .label=${this.label}
+        .helper=${this.helper}
         .searchLabel=${this.searchLabel}
         .notFoundLabel=${notFoundLabel}
         .placeholder=${placeholder}
diff --git a/src/components/ha-generic-picker.ts b/src/components/ha-generic-picker.ts
index 2c699382fd..687a548ede 100644
--- a/src/components/ha-generic-picker.ts
+++ b/src/components/ha-generic-picker.ts
@@ -104,8 +104,8 @@ export class HaGenericPicker extends LitElement {
                 .getAdditionalItems=${this.getAdditionalItems}
               ></ha-picker-combo-box>
             `}
-        ${this._renderHelper()}
       </div>
+      ${this._renderHelper()}
     `;
   }
 
@@ -164,6 +164,10 @@ export class HaGenericPicker extends LitElement {
           display: block;
           margin: 0 0 8px;
         }
+        ha-input-helper-text {
+          display: block;
+          margin: 8px 0 0;
+        }
       `,
     ];
   }