diff --git a/src/panels/developer-tools/service/developer-tools-service.ts b/src/panels/developer-tools/service/developer-tools-service.ts
index 996f377f5f..91c10f6972 100644
--- a/src/panels/developer-tools/service/developer-tools-service.ts
+++ b/src/panels/developer-tools/service/developer-tools-service.ts
@@ -420,6 +420,7 @@ class HaPanelDevService extends LitElement {
     ev.stopPropagation();
     this._serviceData = { service: ev.detail.value || "", data: {} };
     this._yamlEditor?.setValue(this._serviceData);
+    this._checkUiSupported();
   }
 
   private _fillExampleData() {
@@ -441,6 +442,7 @@ class HaPanelDevService extends LitElement {
     });
     this._serviceData = { ...this._serviceData!, data: example };
     this._yamlEditor?.setValue(this._serviceData);
+    this._checkUiSupported();
   }
 
   static get styles(): CSSResultGroup {