diff --git a/src/panels/config/script/ha-script-editor.ts b/src/panels/config/script/ha-script-editor.ts
index 96bef07c53..2eea1afc6f 100644
--- a/src/panels/config/script/ha-script-editor.ts
+++ b/src/panels/config/script/ha-script-editor.ts
@@ -5,7 +5,10 @@ import {
   mdiContentSave,
   mdiDelete,
   mdiDotsVertical,
+  mdiInformationOutline,
+  mdiPlay,
   mdiSort,
+  mdiTransitConnection,
 } from "@mdi/js";
 import "@polymer/app-layout/app-header/app-header";
 import "@polymer/app-layout/app-toolbar/app-toolbar";
@@ -20,6 +23,7 @@ import {
 import { property, query, state } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
 import memoizeOne from "memoize-one";
+import { fireEvent } from "../../../common/dom/fire_event";
 import { computeObjectId } from "../../../common/entity/compute_object_id";
 import { navigate } from "../../../common/navigate";
 import { slugify } from "../../../common/string/slugify";
@@ -178,6 +182,21 @@ export class HaScriptEditor extends KeyboardShortcutMixin(LitElement) {
         .backCallback=${this._backTapped}
         .header=${!this._config?.alias ? "" : this._config.alias}
       >
+        ${this.scriptEntityId && !this.narrow
+          ? html`
+              <a
+                class="trace-link"
+                href="/config/script/trace/${this.scriptEntityId}"
+                slot="toolbar-icon"
+              >
+                <mwc-button>
+                  ${this.hass.localize(
+                    "ui.panel.config.script.editor.show_trace"
+                  )}
+                </mwc-button>
+              </a>
+            `
+          : ""}
         <ha-button-menu corner="BOTTOM_START" slot="toolbar-icon">
           <ha-icon-button
             slot="trigger"
@@ -185,6 +204,42 @@ export class HaScriptEditor extends KeyboardShortcutMixin(LitElement) {
             .path=${mdiDotsVertical}
           ></ha-icon-button>
 
+          <mwc-list-item
+            graphic="icon"
+            .disabled=${!this.scriptEntityId}
+            @click=${this._showInfo}
+          >
+            ${this.hass.localize("ui.panel.config.script.editor.show_info")}
+            <ha-svg-icon
+              slot="graphic"
+              .path=${mdiInformationOutline}
+            ></ha-svg-icon>
+          </mwc-list-item>
+
+          <mwc-list-item
+            graphic="icon"
+            .disabled=${!this.scriptEntityId}
+            @click=${this._runScript}
+          >
+            ${this.hass.localize("ui.panel.config.script.picker.run_script")}
+            <ha-svg-icon slot="graphic" .path=${mdiPlay}></ha-svg-icon>
+          </mwc-list-item>
+
+          ${this.scriptEntityId && this.narrow
+            ? html`
+                <a href="/config/script/trace/${this.scriptEntityId}">
+                  <mwc-list-item graphic="icon">
+                    ${this.hass.localize(
+                      "ui.panel.config.script.editor.show_trace"
+                    )}
+                    <ha-svg-icon
+                      slot="graphic"
+                      .path=${mdiTransitConnection}
+                    ></ha-svg-icon>
+                  </mwc-list-item>
+                </a>
+              `
+            : ""}
           ${this._config && !("use_blueprint" in this._config)
             ? html`
                 <mwc-list-item
@@ -304,35 +359,6 @@ export class HaScriptEditor extends KeyboardShortcutMixin(LitElement) {
                                 @value-changed=${this._valueChanged}
                               ></ha-form>
                             </div>
-                            ${this.scriptEntityId
-                              ? html`
-                                  <div
-                                    class="card-actions layout horizontal justified center"
-                                  >
-                                    <a
-                                      href="/config/script/trace/${this
-                                        .scriptEntityId}"
-                                    >
-                                      <mwc-button>
-                                        ${this.hass.localize(
-                                          "ui.panel.config.script.editor.show_trace"
-                                        )}
-                                      </mwc-button>
-                                    </a>
-                                    <mwc-button
-                                      @click=${this._runScript}
-                                      title=${this.hass.localize(
-                                        "ui.panel.config.script.picker.run_script"
-                                      )}
-                                      ?disabled=${this._dirty}
-                                    >
-                                      ${this.hass.localize(
-                                        "ui.panel.config.script.picker.run_script"
-                                      )}
-                                    </mwc-button>
-                                  </div>
-                                `
-                              : ``}
                           </ha-card>
                         </div>
 
@@ -361,28 +387,6 @@ export class HaScriptEditor extends KeyboardShortcutMixin(LitElement) {
               `
             : this._mode === "yaml"
             ? html`
-                ${!this.narrow
-                  ? html`
-                      <ha-card outlined>
-                        <div class="card-header">${this._config?.alias}</div>
-                        <div
-                          class="card-actions layout horizontal justified center"
-                        >
-                          <mwc-button
-                            @click=${this._runScript}
-                            title=${this.hass.localize(
-                              "ui.panel.config.script.picker.run_script"
-                            )}
-                            ?disabled=${this._dirty}
-                          >
-                            ${this.hass.localize(
-                              "ui.panel.config.script.picker.run_script"
-                            )}
-                          </mwc-button>
-                        </div>
-                      </ha-card>
-                    `
-                  : ``}
                 <ha-yaml-editor
                   .hass=${this.hass}
                   .defaultValue=${this._preprocessYaml()}
@@ -519,6 +523,13 @@ export class HaScriptEditor extends KeyboardShortcutMixin(LitElement) {
     return undefined;
   };
 
+  private async _showInfo() {
+    if (!this.scriptEntityId) {
+      return;
+    }
+    fireEvent(this, "hass-more-info", { entityId: this.scriptEntityId });
+  }
+
   private async _runScript(ev: CustomEvent) {
     ev.stopPropagation();
     await triggerScript(this.hass, this.scriptEntityId as string);
@@ -829,6 +840,13 @@ export class HaScriptEditor extends KeyboardShortcutMixin(LitElement) {
         .header a {
           color: var(--secondary-text-color);
         }
+        .trace-link {
+          text-decoration: none;
+        }
+        ha-button-menu a {
+          text-decoration: none;
+          color: var(--primary-color);
+        }
       `,
     ];
   }
diff --git a/src/translations/en.json b/src/translations/en.json
index b2aa722258..4ca9e25056 100755
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -2290,6 +2290,7 @@
             "id_already_exists": "This ID already exists",
             "introduction": "Use scripts to run a sequence of actions.",
             "show_trace": "[%key:ui::panel::config::automation::editor::show_trace%]",
+            "show_info": "[%key:ui::panel::config::automation::editor::show_info%]",
             "header": "Script: {name}",
             "default_name": "New Script",
             "modes": {