diff --git a/src/panels/config/areas/ha-config-area-page.ts b/src/panels/config/areas/ha-config-area-page.ts
index 4234fdd98d..4edc723c0e 100644
--- a/src/panels/config/areas/ha-config-area-page.ts
+++ b/src/panels/config/areas/ha-config-area-page.ts
@@ -586,7 +586,14 @@ class HaConfigAreaPage extends SubscribeMixin(LitElement) {
   }
 
   private _renderScript(name: string, entityState: ScriptEntity) {
-    return html`<a href=${`/config/script/edit/${entityState.entity_id}`}>
+    const entry = this._entities.find(
+      (e) => e.entity_id === entityState.entity_id
+    );
+    let url = `/config/script/show/${entityState.entity_id}`;
+    if (entry) {
+      url = `/config/script/edit/${entry.unique_id}`;
+    }
+    return html`<a href=${url}>
       <paper-item>
         <paper-item-body> ${name} </paper-item-body>
         <ha-icon-next></ha-icon-next>
diff --git a/src/panels/config/devices/ha-config-device-page.ts b/src/panels/config/devices/ha-config-device-page.ts
index 3c3cd8568c..9d625e4f09 100644
--- a/src/panels/config/devices/ha-config-device-page.ts
+++ b/src/panels/config/devices/ha-config-device-page.ts
@@ -567,11 +567,16 @@ export class HaConfigDevicePage extends LitElement {
                   <div class="items">
                     ${this._related.script.map((script) => {
                       const entityState = this.hass.states[script];
+                      const entry = this.entities.find(
+                        (e) => e.entity_id === script
+                      );
+                      let url = `/config/script/show/${entityState.entity_id}`;
+                      if (entry) {
+                        url = `/config/script/edit/${entry.unique_id}`;
+                      }
                       return entityState
                         ? html`
-                            <a
-                              href=${`/config/script/edit/${entityState.entity_id}`}
-                            >
+                            <a href=${url}>
                               <paper-item .script=${script}>
                                 <paper-item-body>
                                   ${computeStateName(entityState)}