diff --git a/src/panels/config/automation/ha-automation-editor.js b/src/panels/config/automation/ha-automation-editor.js
index 0a905625f4..047da257c9 100644
--- a/src/panels/config/automation/ha-automation-editor.js
+++ b/src/panels/config/automation/ha-automation-editor.js
@@ -86,7 +86,7 @@ class HaAutomationEditor extends LocalizeMixin(NavigateMixin(PolymerElement)) {
       <app-header slot="header" fixed="">
         <app-toolbar>
           <paper-icon-button icon="hass:arrow-left" on-click="backTapped"></paper-icon-button>
-          <div main-title="">[[name]]</div>
+          <div main-title="">[[computeName(automation, localize)]]</div>
         </app-toolbar>
       </app-header>
 
@@ -142,11 +142,6 @@ class HaAutomationEditor extends LocalizeMixin(NavigateMixin(PolymerElement)) {
         observer: "creatingNewChanged",
       },
 
-      name: {
-        type: String,
-        computed: "computeName(automation, localize)",
-      },
-
       isWide: {
         type: Boolean,
         observer: "_updateComponent",
diff --git a/src/panels/config/script/ha-script-editor.js b/src/panels/config/script/ha-script-editor.js
index 6066abb8a4..34dd73a56a 100644
--- a/src/panels/config/script/ha-script-editor.js
+++ b/src/panels/config/script/ha-script-editor.js
@@ -86,7 +86,7 @@ class HaScriptEditor extends LocalizeMixin(NavigateMixin(PolymerElement)) {
       <app-header slot="header" fixed="">
         <app-toolbar>
           <paper-icon-button icon="hass:arrow-left" on-click="backTapped"></paper-icon-button>
-          <div main-title="">Script [[name]]</div>
+          <div main-title="">Script [[computeName(script)]]</div>
         </app-toolbar>
       </app-header>
       <div class="content">
@@ -140,11 +140,6 @@ class HaScriptEditor extends LocalizeMixin(NavigateMixin(PolymerElement)) {
         observer: "creatingNewChanged",
       },
 
-      name: {
-        type: String,
-        computed: "computeName(script)",
-      },
-
       isWide: {
         type: Boolean,
         observer: "_updateComponent",