diff --git a/src/components/ha-select.ts b/src/components/ha-select.ts
index 59269bde4a..b90133b8eb 100644
--- a/src/components/ha-select.ts
+++ b/src/components/ha-select.ts
@@ -44,6 +44,9 @@ export class HaSelect extends SelectBase {
       .mdc-select:not(.mdc-select--disabled) .mdc-select__icon {
         color: var(--secondary-text-color);
       }
+      .mdc-select__anchor {
+        width: var(--ha-select-min-width, 200px);
+      }
     `,
   ];
 }
diff --git a/src/panels/lovelace/entity-rows/hui-input-select-entity-row.ts b/src/panels/lovelace/entity-rows/hui-input-select-entity-row.ts
index 0b88452129..1db8a8c1b6 100644
--- a/src/panels/lovelace/entity-rows/hui-input-select-entity-row.ts
+++ b/src/panels/lovelace/entity-rows/hui-input-select-entity-row.ts
@@ -87,6 +87,7 @@ class HuiInputSelectEntityRow extends LitElement implements LovelaceRow {
     }
     ha-select {
       width: 100%;
+      --ha-select-min-width: 0;
     }
   `;