diff --git a/src/panels/developer-tools/state/developer-tools-state.js b/src/panels/developer-tools/state/developer-tools-state.js
index 92e6d3e038..c02ec0de90 100644
--- a/src/panels/developer-tools/state/developer-tools-state.js
+++ b/src/panels/developer-tools/state/developer-tools-state.js
@@ -74,6 +74,7 @@ class HaPanelDevState extends EventsMixin(PolymerElement) {
           autofocus
           hass="[[hass]]"
           value="{{_entityId}}"
+          on-change="entityIdChanged"
           allow-custom-entity
         ></ha-entity-picker>
         <paper-input
@@ -214,6 +215,12 @@ class HaPanelDevState extends EventsMixin(PolymerElement) {
     ev.preventDefault();
   }
 
+  entityIdChanged() {
+    var state = this.hass.states[this._entityId];
+    this._state = state.state;
+    this._stateAttributes = JSON.stringify(state.attributes, null, "  ");
+  }
+
   entityMoreInfo(ev) {
     ev.preventDefault();
     this.fire("hass-more-info", { entityId: ev.model.entity.entity_id });