diff --git a/src/main.js b/src/main.js
index e6a9ee5..67f231c 100644
--- a/src/main.js
+++ b/src/main.js
@@ -61,7 +61,9 @@ class TemplateEntityRow extends LitElement {
               ${this.state.secondary}
             </div>
           </div>
+          <div class="state">
           ${this.state.state}
+          </div>
         </div>
       </div>
     `;
@@ -72,7 +74,12 @@ class TemplateEntityRow extends LitElement {
     let style = HuiGenericEntityRow.styles;
     style.cssText = style.cssText
       .replace(":host", "#wrapper")
-      .replace("state-badge", "ha-icon");
+      .replace("state-badge", "ha-icon")
+      + `
+      .state {
+        text-align: right;
+      }
+      `;
     return style;
   }
 }
diff --git a/template-entity-row.js b/template-entity-row.js
index 15a209c..28e29dc 100644
--- a/template-entity-row.js
+++ b/template-entity-row.js
@@ -15,7 +15,9 @@
               ${this.state.secondary}
             </div>
           </div>
+          <div class="state">
           ${this.state.state}
+          </div>
         </div>
       </div>
-    `}static get styles(){let e=customElements.get("hui-generic-entity-row").styles;return e.cssText=e.cssText.replace(":host","#wrapper").replace("state-badge","ha-icon"),e}})}]);
\ No newline at end of file
+    `}static get styles(){let e=customElements.get("hui-generic-entity-row").styles;return e.cssText=e.cssText.replace(":host","#wrapper").replace("state-badge","ha-icon")+"\n      .state {\n        text-align: right;\n      }\n      ",e}})}]);
\ No newline at end of file