diff --git a/src/components/entity/state-info.js b/src/components/entity/state-info.js
index 36014db18e..d228de67de 100644
--- a/src/components/entity/state-info.js
+++ b/src/components/entity/state-info.js
@@ -59,6 +59,19 @@ class StateInfo extends LocalizeMixin(PolymerElement) {
           @apply --paper-font-common-nowrap;
           color: var(--secondary-text-color);
         }
+
+        .row {
+          display: flex;
+          flex-direction: row;
+          flex-wrap: no-wrap;
+          width: 100%;
+          justify-content: space-between;
+          margin: 0 2px 4px 0;
+        }
+
+        .row:last-child {
+          margin-bottom: 0px;
+        }
       </style>
     `;
   }
@@ -81,11 +94,26 @@ class StateInfo extends LocalizeMixin(PolymerElement) {
               datetime="[[stateObj.last_changed]]"
             ></ha-relative-time>
             <paper-tooltip animation-delay="0" for="last_changed">
-              [[localize('ui.dialogs.more_info_control.last_updated')]]:
-              <ha-relative-time
-                hass="[[hass]]"
-                datetime="[[stateObj.last_updated]]"
-              ></ha-relative-time>
+              <div>
+                <div class="row">
+                  <span class="column-name">
+                    [[localize('ui.dialogs.more_info_control.last_changed')]]:
+                  </span>
+                  <ha-relative-time
+                    hass="[[hass]]"
+                    datetime="[[stateObj.last_changed]]"
+                  ></ha-relative-time>
+                </div>
+                <div class="row">
+                  <span>
+                    [[localize('ui.dialogs.more_info_control.last_updated')]]:
+                  </span>
+                  <ha-relative-time
+                    hass="[[hass]]"
+                    datetime="[[stateObj.last_updated]]"
+                  ></ha-relative-time>
+                </div>
+              </div>
             </paper-tooltip>
           </div>
         </template>
diff --git a/src/translations/en.json b/src/translations/en.json
index 5b804e72ff..6323e70856 100755
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -518,6 +518,7 @@
         "details": "Details",
         "history": "History",
         "last_updated": "Last updated",
+        "last_changed": "Last changed",
         "script": {
           "last_action": "Last Action",
           "last_triggered": "Last Triggered"