diff --git a/src/components/entity/ha-entity-combo-box.ts b/src/components/entity/ha-entity-combo-box.ts
index 9a89fe23d3..f0f3ede62b 100644
--- a/src/components/entity/ha-entity-combo-box.ts
+++ b/src/components/entity/ha-entity-combo-box.ts
@@ -314,9 +314,7 @@ export class HaEntityComboBox extends LitElement {
             ...hass!.states[entityId],
             label: "",
             primary: primary,
-            secondary:
-              secondary ||
-              this.hass.localize("ui.components.device-picker.no_area"),
+            secondary: secondary,
             translated_domain: translatedDomain,
             sorting_label: [deviceName, entityName].filter(Boolean).join("-"),
             entity_name: entityName || deviceName,
diff --git a/src/components/entity/ha-entity-picker.ts b/src/components/entity/ha-entity-picker.ts
index 0cba69c515..515a5a58b4 100644
--- a/src/components/entity/ha-entity-picker.ts
+++ b/src/components/entity/ha-entity-picker.ts
@@ -162,10 +162,7 @@ export class HaEntityPicker extends LitElement {
         slot="start"
       ></state-badge>
       <span slot="headline">${primary}</span>
-      <span slot="supporting-text">
-        ${secondary ||
-        this.hass.localize("ui.components.device-picker.no_area")}
-      </span>
+      <span slot="supporting-text">${secondary}</span>
       ${showClearIcon
         ? html`<ha-icon-button
             class="clear"
diff --git a/src/dialogs/quick-bar/ha-quick-bar.ts b/src/dialogs/quick-bar/ha-quick-bar.ts
index cf57a14e31..3af88bb787 100644
--- a/src/dialogs/quick-bar/ha-quick-bar.ts
+++ b/src/dialogs/quick-bar/ha-quick-bar.ts
@@ -358,6 +358,7 @@ export class QuickBar extends LitElement {
   private _renderDeviceItem(item: DeviceItem, index?: number) {
     return html`
       <ha-md-list-item
+        class="two-line"
         .item=${item}
         index=${ifDefined(index)}
         tabindex="0"
@@ -376,6 +377,7 @@ export class QuickBar extends LitElement {
 
     return html`
       <ha-md-list-item
+        class=${showEntityId ? "three-line" : "two-line"}
         .item=${item}
         index=${ifDefined(index)}
         tabindex="0"
@@ -621,9 +623,7 @@ export class QuickBar extends LitElement {
 
         const entityItem = {
           primaryText: primary,
-          altText:
-            secondary ||
-            this.hass.localize("ui.components.device-picker.no_area"),
+          altText: secondary,
           icon: html`
             <ha-state-icon
               .hass=${this.hass}
@@ -1021,6 +1021,23 @@ export class QuickBar extends LitElement {
           width: 100%;
         }
 
+        /* Fixed height for items because we are use virtualizer */
+        ha-md-list-item.two-line {
+          --md-list-item-one-line-container-height: 64px;
+          --md-list-item-two-line-container-height: 64px;
+          --md-list-item-top-space: 8px;
+          --md-list-item-bottom-space: 8px;
+        }
+
+        ha-md-list-item.three-line {
+          width: 100%;
+          --md-list-item-one-line-container-height: 72px;
+          --md-list-item-two-line-container-height: 72px;
+          --md-list-item-three-line-container-height: 72px;
+          --md-list-item-top-space: 8px;
+          --md-list-item-bottom-space: 8px;
+        }
+
         ha-tip {
           padding: 20px;
         }