diff --git a/src/components/entity/ha-entity-picker.ts b/src/components/entity/ha-entity-picker.ts
index ccb233fffb..88353724f2 100644
--- a/src/components/entity/ha-entity-picker.ts
+++ b/src/components/entity/ha-entity-picker.ts
@@ -407,7 +407,7 @@ export class HaEntityPicker extends LitElement {
 
   private _valueChanged(ev: ValueChangedEvent<string>) {
     ev.stopPropagation();
-    const newValue = ev.detail.value;
+    const newValue = ev.detail.value.trim();
 
     if (newValue && newValue.startsWith(CREATE_ID)) {
       const domain = newValue.substring(CREATE_ID.length);
@@ -427,7 +427,7 @@ export class HaEntityPicker extends LitElement {
 
   private _filterChanged(ev: CustomEvent): void {
     const target = ev.target as HaComboBox;
-    const filterString = ev.detail.value.toLowerCase();
+    const filterString = ev.detail.value.trim().toLowerCase();
     target.filteredItems = filterString.length
       ? fuzzyFilterSort<HassEntityWithCachedName>(filterString, this._states)
       : this._states;
diff --git a/src/components/search-input-outlined.ts b/src/components/search-input-outlined.ts
index 693be1feac..06fef1cd0a 100644
--- a/src/components/search-input-outlined.ts
+++ b/src/components/search-input-outlined.ts
@@ -79,7 +79,7 @@ class SearchInputOutlined extends LitElement {
   }
 
   private async _filterInputChanged(e) {
-    this._filterChanged(e.target.value);
+    this._filterChanged(e.target.value?.trim());
   }
 
   private async _clearSearch() {
diff --git a/src/components/search-input.ts b/src/components/search-input.ts
index 2f4298ecaa..2d5180a6e6 100644
--- a/src/components/search-input.ts
+++ b/src/components/search-input.ts
@@ -67,7 +67,7 @@ class SearchInput extends LitElement {
   }
 
   private async _filterInputChanged(e) {
-    this._filterChanged(e.target.value);
+    this._filterChanged(e.target.value?.trim());
   }
 
   private async _clearSearch() {