diff --git a/src/panels/lovelace/components/hui-generic-entity-row.js b/src/panels/lovelace/components/hui-generic-entity-row.js
index 01fe7e53f1..1d0eaab6da 100644
--- a/src/panels/lovelace/components/hui-generic-entity-row.js
+++ b/src/panels/lovelace/components/hui-generic-entity-row.js
@@ -17,11 +17,14 @@ class HuiGenericEntityRow extends PolymerElement {
         }
         .flex {
           flex: 1;
-          overflow: hidden;
           margin-left: 16px;
           display: flex;
           justify-content: space-between;
           align-items: center;
+          min-width: 0;
+        }
+        .info {
+          flex: 1 0 60px;
         }
         .info,
         .info > * {
@@ -31,6 +34,7 @@ class HuiGenericEntityRow extends PolymerElement {
         }
         .flex ::slotted(*) {
           margin-left: 8px;
+          min-width: 0;
         }
         .secondary,
         ha-relative-time {
@@ -46,6 +50,9 @@ class HuiGenericEntityRow extends PolymerElement {
           background-color: yellow;
           padding: 8px;
         }
+        state-badge {
+          flex: 0 0 40px;
+        }
       </style>
       <template is="dom-if" if="[[_stateObj]]">
         <template is="dom-if" if="[[!config.icon]]">