diff --git a/src/panels/developer-tools/state/developer-tools-state.js b/src/panels/developer-tools/state/developer-tools-state.js
index 5d7cd84cc..aff517c2b 100644
--- a/src/panels/developer-tools/state/developer-tools-state.js
+++ b/src/panels/developer-tools/state/developer-tools-state.js
@@ -2,6 +2,7 @@ import "@material/mwc-button";
 import {
   mdiClipboardTextMultipleOutline,
   mdiInformationOutline,
+  mdiRefresh,
 } from "@mdi/js";
 import "@polymer/paper-checkbox/paper-checkbox";
 import "@polymer/paper-input/paper-input";
@@ -46,8 +47,10 @@ class HaPanelDevState extends EventsMixin(LocalizeMixin(PolymerElement)) {
           padding: 0 16px;
         }
 
-        mwc-button {
+        .button-row {
+          display: flex;
           margin-top: 8px;
+          align-items: center;
         }
 
         .table-wrapper {
@@ -139,9 +142,19 @@ class HaPanelDevState extends EventsMixin(LocalizeMixin(PolymerElement)) {
             error="[[!validJSON]]"
             on-value-changed="_yamlChanged"
           ></ha-code-editor>
-          <mwc-button on-click="handleSetState" disabled="[[!validJSON]]" raised
-            >[[localize('ui.panel.developer-tools.tabs.states.set_state')]]</mwc-button
-          >
+          <div class="button-row">
+            <mwc-button
+              on-click="handleSetState"
+              disabled="[[!validJSON]]"
+              raised
+              >[[localize('ui.panel.developer-tools.tabs.states.set_state')]]</mwc-button
+            >
+            <mwc-icon-button
+              on-click="entityIdChanged"
+              label="[[localize('ui.common.refresh')]]"
+              ><ha-svg-icon path="[[refreshIcon()]]"></ha-svg-icon
+            ></mwc-icon-button>
+          </div>
         </div>
         <div class="info">
           <template is="dom-if" if="[[_entity]]">
@@ -367,6 +380,10 @@ class HaPanelDevState extends EventsMixin(LocalizeMixin(PolymerElement)) {
     return mdiClipboardTextMultipleOutline;
   }
 
+  refreshIcon() {
+    return mdiRefresh;
+  }
+
   computeEntities(hass, _entityFilter, _stateFilter, _attributeFilter) {
     return Object.keys(hass.states)
       .map(function (key) {