diff --git a/src/panels/lovelace/entity-rows/hui-input-number-entity-row.ts b/src/panels/lovelace/entity-rows/hui-input-number-entity-row.ts
index 40163bce0..90889732d 100644
--- a/src/panels/lovelace/entity-rows/hui-input-number-entity-row.ts
+++ b/src/panels/lovelace/entity-rows/hui-input-number-entity-row.ts
@@ -120,8 +120,11 @@ class HuiInputNumberEntityRow extends LitElement implements LovelaceRow {
                   type="number"
                   @change=${this._selectedValueChanged}
                   id="input"
-                ></paper-input>
-                ${stateObj.attributes.unit_of_measurement}
+                >
+                  <span slot="suffix">
+                    ${stateObj.attributes.unit_of_measurement}
+                  </span>
+                </paper-input>
               </div>
             `}
       </hui-generic-entity-row>
diff --git a/src/state-summary/state-card-input_number.js b/src/state-summary/state-card-input_number.js
index a3c457711..afa4959bb 100644
--- a/src/state-summary/state-card-input_number.js
+++ b/src/state-summary/state-card-input_number.js
@@ -67,10 +67,10 @@ class StateCardInputNumber extends mixinBehaviors(
           on-click="stopPropagation"
           hidden="[[hiddenbox]]"
         >
+          <span slot="suffix">
+            [[stateObj.attributes.unit_of_measurement]]
+          </span>
         </paper-input>
-        <div class="state" hidden="[[hiddenbox]]">
-          [[stateObj.attributes.unit_of_measurement]]
-        </div>
         <div
           id="sliderstate"
           class="state sliderstate"