Change drag selected styling

Update hover and hightlight states for automation rows
2025-11-01 23:19:34 +00:00 · 2025-09-01 17:56:03 +02:00 · 2025-09-01 17:28:20 +02:00
40 changed files with 330 additions and 1110 deletions
--- a/cast/src/media/entrypoint.ts
+++ b/cast/src/media/entrypoint.ts
@@ -5,17 +5,17 @@ const castContext = framework.CastReceiverContext.getInstance();
 const playerManager = castContext.getPlayerManager();

 playerManager.setMessageInterceptor(
-  "LOAD" as framework.messages.MessageType.LOAD,
+  framework.messages.MessageType.LOAD,
  (loadRequestData) => {
    const media = loadRequestData.media;
    // Special handling if it came from Google Assistant
    if (media.entity) {
      media.contentId = media.entity;
-      media.streamType = "LIVE" as framework.messages.StreamType.LIVE;
+      media.streamType = framework.messages.StreamType.LIVE;
      media.contentType = "application/vnd.apple.mpegurl";
      // @ts-ignore
      media.hlsVideoSegmentFormat =
-        "fmp4" as framework.messages.HlsVideoSegmentFormat.FMP4;
+        framework.messages.HlsVideoSegmentFormat.FMP4;
    }
    return loadRequestData;
  }
--- a/cast/src/receiver/entrypoint.ts
+++ b/cast/src/receiver/entrypoint.ts
@@ -40,8 +40,7 @@ const playDummyMedia = (viewTitle?: string) => {
  loadRequestData.media.contentId =
    "https://cast.home-assistant.io/images/google-nest-hub.png";
  loadRequestData.media.contentType = "image/jpeg";
-  loadRequestData.media.streamType =
-    "NONE" as framework.messages.StreamType.NONE;
+  loadRequestData.media.streamType = framework.messages.StreamType.NONE;
  const metadata = new framework.messages.GenericMediaMetadata();
  metadata.title = viewTitle;
  loadRequestData.media.metadata = metadata;
@@ -90,7 +89,7 @@ const showMediaPlayer = () => {
 const options = new framework.CastReceiverOptions();
 options.disableIdleTimeout = true;
 options.customNamespaces = {
-  [CAST_NS]: "json" as framework.system.MessageType.JSON,
+  [CAST_NS]: framework.system.MessageType.JSON,
 };

 castContext.addCustomMessageListener(
@@ -98,7 +97,9 @@ castContext.addCustomMessageListener(
  // @ts-ignore
  (ev: ReceivedMessage<HassMessage>) => {
    // We received a show Lovelace command, stop media from playing, hide media player and show Lovelace controller
-    if (playerManager.getPlayerState() !== "IDLE") {
+    if (
+      playerManager.getPlayerState() !== framework.messages.PlayerState.IDLE
+    ) {
      playerManager.stop();
    } else {
      showLovelaceController();
@@ -112,7 +113,7 @@ castContext.addCustomMessageListener(
 const playerManager = castContext.getPlayerManager();

 playerManager.setMessageInterceptor(
-  "LOAD" as framework.messages.MessageType.LOAD,
+  framework.messages.MessageType.LOAD,
  (loadRequestData) => {
    if (
      loadRequestData.media.contentId ===
@@ -126,23 +127,24 @@ playerManager.setMessageInterceptor(
    // Special handling if it came from Google Assistant
    if (media.entity) {
      media.contentId = media.entity;
-      media.streamType = "LIVE" as framework.messages.StreamType.LIVE;
+      media.streamType = framework.messages.StreamType.LIVE;
      media.contentType = "application/vnd.apple.mpegurl";
      // @ts-ignore
      media.hlsVideoSegmentFormat =
-        "fmp4" as framework.messages.HlsVideoSegmentFormat.FMP4;
+        framework.messages.HlsVideoSegmentFormat.FMP4;
    }
    return loadRequestData;
  }
 );

 playerManager.addEventListener(
-  "MEDIA_STATUS" as framework.events.EventType.MEDIA_STATUS,
+  framework.events.EventType.MEDIA_STATUS,
  (event) => {
    if (
-      event.mediaStatus?.playerState === "IDLE" &&
+      event.mediaStatus?.playerState === framework.messages.PlayerState.IDLE &&
      event.mediaStatus?.idleReason &&
-      event.mediaStatus?.idleReason !== "INTERRUPTED"
+      event.mediaStatus?.idleReason !==
+        framework.messages.IdleReason.INTERRUPTED
    ) {
      // media finished or stopped, return to default Lovelace
      showLovelaceController();
--- a/package.json
+++ b/package.json
@@ -162,7 +162,7 @@
    "@rspack/core": "1.5.1",
    "@rspack/dev-server": "1.1.4",
    "@types/babel__plugin-transform-runtime": "7.9.5",
-    "@types/chromecast-caf-receiver": "6.0.24",
+    "@types/chromecast-caf-receiver": "6.0.22",
    "@types/chromecast-caf-sender": "1.0.11",
    "@types/color-name": "2.0.0",
    "@types/culori": "4.0.0",
--- a/src/components/ha-automation-row.ts
+++ b/src/components/ha-automation-row.ts
@@ -80,15 +80,7 @@ export class HaAutomationRow extends LitElement {
      ev.key !== " " &&
      !(
        (this.sortSelected || ev.altKey) &&
-        !(ev.ctrlKey || ev.metaKey) &&
-        !ev.shiftKey &&
        (ev.key === "ArrowUp" || ev.key === "ArrowDown")
-      ) &&
-      !(
-        (ev.ctrlKey || ev.metaKey) &&
-        !ev.shiftKey &&
-        !ev.altKey &&
-        (ev.key === "c" || ev.key === "x" || ev.key === "Delete")
      )
    ) {
      return;
@@ -109,22 +101,6 @@ export class HaAutomationRow extends LitElement {
      return;
    }

-    if (ev.ctrlKey || ev.metaKey) {
-      if (ev.key === "c") {
-        fireEvent(this, "copy-row");
-        return;
-      }
-      if (ev.key === "x") {
-        fireEvent(this, "cut-row");
-        return;
-      }
-
-      if (ev.key === "Delete") {
-        fireEvent(this, "delete-row");
-        return;
-      }
-    }
-
    this.click();
  }

@@ -220,8 +196,5 @@ declare global {
  interface HASSDomEvents {
    "toggle-collapsed": undefined;
    "stop-sort-selection": undefined;
-    "copy-row": undefined;
-    "cut-row": undefined;
-    "delete-row": undefined;
  }
 }
--- a/src/components/ha-bottom-sheet.ts
+++ b/src/components/ha-bottom-sheet.ts
@@ -30,8 +30,6 @@ export class HaBottomSheet extends LitElement {

  @state() private _dialogMaxViewpointHeight = 70;

-  @state() private _dialogMinViewpointHeight = 55;
-
  @state() private _dialogViewportHeight?: number;

  render() {
@@ -43,7 +41,6 @@ export class HaBottomSheet extends LitElement {
          ? `${this._dialogViewportHeight}vh`
          : "auto",
        maxHeight: `${this._dialogMaxViewpointHeight}vh`,
-        minHeight: `${this._dialogMinViewpointHeight}vh`,
      })}
    >
      <div class="handle-wrapper">
@@ -83,7 +80,6 @@ export class HaBottomSheet extends LitElement {
      this._dialogViewportHeight =
        (this._dialog.offsetHeight / window.innerHeight) * 100;
      this._dialogMaxViewpointHeight = 90;
-      this._dialogMinViewpointHeight = 20;
    } else {
      // after close animation is done close dialog element and fire closed event
      this._dialog.close();
--- a/src/components/ha-related-items.ts
+++ b/src/components/ha-related-items.ts
@@ -3,7 +3,6 @@ import {
  mdiDevices,
  mdiPaletteSwatch,
  mdiTextureBox,
-  mdiTransitConnectionVariant,
 } from "@mdi/js";
 import type { CSSResultGroup, PropertyValues } from "lit";
 import { LitElement, css, html, nothing } from "lit";
@@ -267,9 +266,7 @@ export class HaRelatedItems extends LitElement {
                  <a href="/config/devices/device/${relatedDeviceId}">
                    <ha-list-item hasMeta graphic="icon">
                      <ha-svg-icon
-                        .path=${device.entry_type === "service"
-                          ? mdiTransitConnectionVariant
-                          : mdiDevices}
+                        .path=${mdiDevices}
                        slot="graphic"
                      ></ha-svg-icon>
                      ${device.name_by_user || device.name}
--- a/src/components/ha-sortable.ts
+++ b/src/components/ha-sortable.ts
@@ -15,16 +15,21 @@ declare global {
    "item-added": {
      index: number;
      data: any;
-      item: any;
    };
    "item-removed": {
      index: number;
    };
    "drag-start": undefined;
    "drag-end": undefined;
+    "item-cloned": HaSortableClonedEventData;
  }
 }

+export interface HaSortableClonedEventData {
+  item: any;
+  clone: any;
+}
+
 export type HaSortableOptions = Omit<
  SortableInstance.SortableOptions,
  "onStart" | "onChoose" | "onEnd" | "onUpdate" | "onAdd" | "onRemove"
@@ -149,6 +154,7 @@ export class HaSortable extends LitElement {
      onUpdate: this._handleUpdate,
      onAdd: this._handleAdd,
      onRemove: this._handleRemove,
+      onClone: this._handleClone,
    };

    if (this.draggableSelector) {
@@ -181,7 +187,6 @@ export class HaSortable extends LitElement {
    fireEvent(this, "item-added", {
      index: evt.newIndex,
      data: evt.item.sortableData,
-      item: evt.item,
    });
  };

@@ -189,6 +194,10 @@ export class HaSortable extends LitElement {
    fireEvent(this, "item-removed", { index: evt.oldIndex });
  };

+  private _handleClone = (evt) => {
+    fireEvent(this, "item-cloned", evt);
+  };
+
  private _handleEnd = async (evt) => {
    fireEvent(this, "drag-end");
    // put back in original location
--- a/src/dialogs/generic/dialog-box.ts
+++ b/src/dialogs/generic/dialog-box.ts
@@ -3,11 +3,11 @@ import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
 import { ifDefined } from "lit/directives/if-defined";
 import { fireEvent } from "../../common/dom/fire_event";
-import "../../components/ha-button";
-import "../../components/ha-dialog-header";
 import "../../components/ha-md-dialog";
 import type { HaMdDialog } from "../../components/ha-md-dialog";
+import "../../components/ha-dialog-header";
 import "../../components/ha-svg-icon";
+import "../../components/ha-button";
 import "../../components/ha-textfield";
 import type { HaTextField } from "../../components/ha-textfield";
 import type { HomeAssistant } from "../../types";
@@ -52,7 +52,7 @@ class DialogBox extends LitElement {
      return nothing;
    }

-    const confirmPrompt = this._params.confirmation || !!this._params.prompt;
+    const confirmPrompt = this._params.confirmation || this._params.prompt;

    const dialogTitle =
      this._params.title ||
@@ -62,7 +62,7 @@ class DialogBox extends LitElement {
    return html`
      <ha-md-dialog
        open
-        .disableCancelAction=${confirmPrompt}
+        .disableCancelAction=${confirmPrompt || false}
        @closed=${this._dialogClosed}
        type="alert"
        aria-labelledby="dialog-box-title"
@@ -100,22 +100,23 @@ class DialogBox extends LitElement {
            : ""}
        </div>
        <div slot="actions">
-          ${confirmPrompt
-            ? html`
-                <ha-button
-                  @click=${this._dismiss}
-                  ?autofocus=${!this._params.prompt && this._params.destructive}
-                  appearance="plain"
-                >
-                  ${this._params.dismissText
-                    ? this._params.dismissText
-                    : this.hass.localize("ui.common.cancel")}
-                </ha-button>
-              `
-            : nothing}
+          ${confirmPrompt &&
+          html`
+            <ha-button
+              @click=${this._dismiss}
+              ?dialogInitialFocus=${!this._params.prompt &&
+              this._params.destructive}
+              appearance="plain"
+            >
+              ${this._params.dismissText
+                ? this._params.dismissText
+                : this.hass.localize("ui.common.cancel")}
+            </ha-button>
+          `}
          <ha-button
            @click=${this._confirm}
-            ?autofocus=${!this._params.prompt && !this._params.destructive}
+            ?dialogInitialFocus=${!this._params.prompt &&
+            !this._params.destructive}
            variant=${this._params.destructive ? "danger" : "brand"}
          >
            ${this._params.confirmText
--- a/src/dialogs/more-info/ha-more-info-dialog.ts
+++ b/src/dialogs/more-info/ha-more-info-dialog.ts
@@ -8,7 +8,6 @@ import {
  mdiPencil,
  mdiPencilOff,
  mdiPencilOutline,
-  mdiTransitConnectionVariant,
 } from "@mdi/js";
 import type { HassEntity } from "home-assistant-js-websocket";
 import type { PropertyValues } from "lit";
@@ -312,8 +311,6 @@ export class MoreInfoDialog extends LitElement {
    const isAdmin = this.hass.user!.is_admin;

    const deviceId = this._getDeviceId();
-    const deviceType =
-      (deviceId && this.hass.devices[deviceId].entry_type) || "device";

    const isDefaultView = this._currView === DEFAULT_VIEW && !this._childView;
    const isSpecificInitialView =
@@ -437,18 +434,11 @@ export class MoreInfoDialog extends LitElement {
                                @request-selected=${this._goToDevice}
                              >
                                ${this.hass.localize(
-                                  "ui.dialogs.more_info_control.device_or_service_info",
-                                  {
-                                    type: this.hass.localize(
-                                      `ui.dialogs.more_info_control.device_type.${deviceType}`
-                                    ),
-                                  }
+                                  "ui.dialogs.more_info_control.device_info"
                                )}
                                <ha-svg-icon
                                  slot="graphic"
-                                  .path=${deviceType === "service"
-                                    ? mdiTransitConnectionVariant
-                                    : mdiDevices}
+                                  .path=${mdiDevices}
                                ></ha-svg-icon>
                              </ha-list-item>
                            `
--- a/src/mixins/keyboard-shortcut-mixin.ts
+++ b/src/mixins/keyboard-shortcut-mixin.ts
@@ -11,54 +11,23 @@ export const KeyboardShortcutMixin = <T extends Constructor<LitElement>>(
  class extends superClass {
    private _keydownEvent = (event: KeyboardEvent) => {
      const supportedShortcuts = this.supportedShortcuts();
-      if (
-        (event.ctrlKey || event.metaKey) &&
-        !event.shiftKey &&
-        !event.altKey &&
-        event.key in supportedShortcuts
-      ) {
+      if ((event.ctrlKey || event.metaKey) && event.key in supportedShortcuts) {
        event.preventDefault();
        supportedShortcuts[event.key]();
-        return;
-      }
-
-      const supportedSingleKeyShortcuts = this.supportedSingleKeyShortcuts();
-      if (event.key in supportedSingleKeyShortcuts) {
-        event.preventDefault();
-        supportedSingleKeyShortcuts[event.key]();
      }
    };

-    private _listenersAdded = false;
-
    public connectedCallback() {
      super.connectedCallback();
-      this.addKeyboardShortcuts();
-    }
-
-    public disconnectedCallback() {
-      this.removeKeyboardShortcuts();
-      super.disconnectedCallback();
-    }
-
-    public addKeyboardShortcuts() {
-      if (this._listenersAdded) {
-        return;
-      }
-      this._listenersAdded = true;
      window.addEventListener("keydown", this._keydownEvent);
    }

-    public removeKeyboardShortcuts() {
-      this._listenersAdded = false;
+    public disconnectedCallback() {
      window.removeEventListener("keydown", this._keydownEvent);
+      super.disconnectedCallback();
    }

    protected supportedShortcuts(): SupportedShortcuts {
      return {};
    }
-
-    protected supportedSingleKeyShortcuts(): SupportedShortcuts {
-      return {};
-    }
  };
--- a/src/panels/config/automation/action/ha-automation-action-row.ts
+++ b/src/panels/config/automation/action/ha-automation-action-row.ts
@@ -5,12 +5,12 @@ import {
  mdiArrowUp,
  mdiContentCopy,
  mdiContentCut,
+  mdiContentDuplicate,
  mdiDelete,
  mdiDotsVertical,
  mdiPlay,
  mdiPlayCircleOutline,
  mdiPlaylistEdit,
-  mdiPlusCircleMultipleOutline,
  mdiRenameBox,
  mdiStopCircleOutline,
 } from "@mdi/js";
@@ -89,7 +89,6 @@ import "./types/ha-automation-action-set_conversation_response";
 import "./types/ha-automation-action-stop";
 import "./types/ha-automation-action-wait_for_trigger";
 import "./types/ha-automation-action-wait_template";
-import { copyToClipboard } from "../../../../common/util/copy-clipboard";

 export const getAutomationActionType = memoizeOne(
  (action: Action | undefined) => {
@@ -196,10 +195,6 @@ export default class HaAutomationActionRow extends LitElement {
  @query("ha-automation-row")
  private _automationRowElement?: HaAutomationRow;

-  get selected() {
-    return this._selected;
-  }
-
  protected firstUpdated(changedProperties: PropertyValues): void {
    super.firstUpdated(changedProperties);

@@ -310,7 +305,7 @@ export default class HaAutomationActionRow extends LitElement {
              )}
              <ha-svg-icon
                slot="start"
-                .path=${mdiPlusCircleMultipleOutline}
+                .path=${mdiContentDuplicate}
              ></ha-svg-icon>
            </ha-md-menu-item>

@@ -443,6 +438,7 @@ export default class HaAutomationActionRow extends LitElement {
        ${this.optionsInSidebar
          ? html`<ha-automation-row
              .disabled=${this.action.enabled === false}
+              @click=${this._toggleSidebar}
              .leftChevron=${[
                ...ACTION_BUILDING_BLOCKS,
                ...ACTION_COMBINED_BLOCKS,
@@ -454,16 +450,12 @@ export default class HaAutomationActionRow extends LitElement {
              .collapsed=${this._collapsed}
              .selected=${this._selected}
              .highlight=${this.highlight}
+              @toggle-collapsed=${this._toggleCollapse}
              .buildingBlock=${[
                ...ACTION_BUILDING_BLOCKS,
                ...ACTION_COMBINED_BLOCKS,
              ].includes(blockType!)}
              .sortSelected=${this.sortSelected}
-              @click=${this._toggleSidebar}
-              @toggle-collapsed=${this._toggleCollapse}
-              @copy-row=${this._copyAction}
-              @cut-row=${this._cutAction}
-              @delete-row=${this._onDelete}
              >${this._renderRow()}</ha-automation-row
            >`
          : html`
@@ -508,7 +500,6 @@ export default class HaAutomationActionRow extends LitElement {
      ...this._clipboard,
      action: deepClone(this.action),
    };
-    copyToClipboard(JSON.stringify(this.action));
  }

  private _onDisable = () => {
@@ -523,15 +514,6 @@ export default class HaAutomationActionRow extends LitElement {
  };

  private _runAction = async () => {
-    requestAnimationFrame(() => {
-      // @ts-ignore is supported in all browsers except firefox
-      if (this.scrollIntoViewIfNeeded) {
-        // @ts-ignore is supported in all browsers except firefox
-        this.scrollIntoViewIfNeeded();
-        return;
-      }
-      this.scrollIntoView();
-    });
    const validated = await validateConfig(this.hass, {
      actions: this.action,
    });
@@ -641,12 +623,6 @@ export default class HaAutomationActionRow extends LitElement {

  private _copyAction = () => {
    this._setClipboard();
-    showToast(this, {
-      message: this.hass.localize(
-        "ui.panel.config.automation.editor.actions.copied_to_clipboard"
-      ),
-      duration: 2000,
-    });
  };

  private _cutAction = () => {
@@ -655,12 +631,6 @@ export default class HaAutomationActionRow extends LitElement {
    if (this._selected) {
      fireEvent(this, "close-sidebar");
    }
-    showToast(this, {
-      message: this.hass.localize(
-        "ui.panel.config.automation.editor.actions.cut_to_clipboard"
-      ),
-      duration: 2000,
-    });
  };

  private _moveUp = () => {
@@ -791,6 +761,10 @@ export default class HaAutomationActionRow extends LitElement {
    this._collapsed = !this._collapsed;
  }

+  public isSelected() {
+    return this._selected;
+  }
+
  public focus() {
    this._automationRowElement?.focus();
  }
--- a/src/panels/config/automation/action/ha-automation-action.ts
+++ b/src/panels/config/automation/action/ha-automation-action.ts
@@ -9,6 +9,7 @@ import { fireEvent } from "../../../../common/dom/fire_event";
 import { nextRender } from "../../../../common/util/render-status";
 import "../../../../components/ha-button";
 import "../../../../components/ha-sortable";
+import type { HaSortableClonedEventData } from "../../../../components/ha-sortable";
 import "../../../../components/ha-svg-icon";
 import {
  ACTION_BUILDING_BLOCKS,
@@ -75,6 +76,7 @@ export default class HaAutomationAction extends LitElement {
        @item-moved=${this._actionMoved}
        @item-added=${this._actionAdded}
        @item-removed=${this._actionRemoved}
+        @item-cloned=${this._actionCloned}
      >
        <div class="rows ${!this.optionsInSidebar ? "no-sidebar" : ""}">
          ${repeat(
@@ -299,8 +301,11 @@ export default class HaAutomationAction extends LitElement {
  private async _actionAdded(ev: CustomEvent): Promise<void> {
    ev.stopPropagation();
    const { index, data } = ev.detail;
-    const item = ev.detail.item as HaAutomationActionRow;
-    const selected = item.selected;
+    let selected = false;
+    if (data?.["ha-automation-row-selected"]) {
+      selected = true;
+      delete data["ha-automation-row-selected"];
+    }

    let actions = [
      ...this.actions.slice(0, index),
@@ -358,6 +363,12 @@ export default class HaAutomationAction extends LitElement {
    fireEvent(this, "value-changed", { value: actions });
  }

+  private _actionCloned(ev: CustomEvent<HaSortableClonedEventData>) {
+    if (ev.detail.item.action && ev.detail.item.isSelected()) {
+      ev.detail.item.action["ha-automation-row-selected"] = true;
+    }
+  }
+
  private _duplicateAction(ev: CustomEvent) {
    ev.stopPropagation();
    const index = (ev.target as any).index;
--- a/src/panels/config/automation/add-automation-element-dialog.ts
+++ b/src/panels/config/automation/add-automation-element-dialog.ts
@@ -1,9 +1,4 @@
-import {
-  mdiAppleKeyboardCommand,
-  mdiClose,
-  mdiContentPaste,
-  mdiPlus,
-} from "@mdi/js";
+import { mdiClose, mdiContentPaste, mdiPlus } from "@mdi/js";
 import Fuse from "fuse.js";
 import type { CSSResultGroup, PropertyValues, TemplateResult } from "lit";
 import { LitElement, css, html, nothing } from "lit";
@@ -46,14 +41,11 @@ import {
 } from "../../../data/integration";
 import { TRIGGER_GROUPS, TRIGGER_ICONS } from "../../../data/trigger";
 import type { HassDialog } from "../../../dialogs/make-dialog-manager";
-import { KeyboardShortcutMixin } from "../../../mixins/keyboard-shortcut-mixin";
-import { HaFuse } from "../../../resources/fuse";
 import { haStyle, haStyleDialog } from "../../../resources/styles";
 import type { HomeAssistant } from "../../../types";
-import { isMac } from "../../../util/is_mac";
-import { showToast } from "../../../util/toast";
 import type { AddAutomationElementDialogParams } from "./show-add-automation-element-dialog";
 import { PASTE_VALUE } from "./show-add-automation-element-dialog";
+import { HaFuse } from "../../../resources/fuse";

 const TYPES = {
  trigger: { groups: TRIGGER_GROUPS, icons: TRIGGER_ICONS },
@@ -93,10 +85,7 @@ const ENTITY_DOMAINS_OTHER = new Set([
 const ENTITY_DOMAINS_MAIN = new Set(["notify"]);

@customElement("add-automation-element-dialog")
-class DialogAddAutomationElement
-  extends KeyboardShortcutMixin(LitElement)
-  implements HassDialog
-{
+class DialogAddAutomationElement extends LitElement implements HassDialog {
  @property({ attribute: false }) public hass!: HomeAssistant;

  @state() private _params?: AddAutomationElementDialogParams;
@@ -119,14 +108,9 @@ class DialogAddAutomationElement

  @state() private _height?: number;

-  @state() private _narrow = false;
-
  public showDialog(params): void {
    this._params = params;
    this._group = params.group;
-
-    this.addKeyboardShortcuts();
-
    if (this._params?.type === "action") {
      this.hass.loadBackendTranslation("services");
      this._fetchManifests();
@@ -136,12 +120,9 @@ class DialogAddAutomationElement
    this._fullScreen = matchMedia(
      "all and (max-width: 450px), all and (max-height: 500px)"
    ).matches;
-
-    this._narrow = matchMedia("(max-width: 870px)").matches;
  }

  public closeDialog() {
-    this.removeKeyboardShortcuts();
    if (this._params) {
      fireEvent(this, "dialog-closed", { dialog: this.localName });
    }
@@ -574,37 +555,15 @@ class DialogAddAutomationElement
                  .value=${PASTE_VALUE}
                  @click=${this._selected}
                >
-                  <div class="shortcut-label">
-                    <div class="label">
-                      <div>
-                        ${this.hass.localize(
-                          `ui.panel.config.automation.editor.${this._params.type}s.paste`
-                        )}
-                      </div>
-                      <div class="supporting-text">
-                        ${this.hass.localize(
-                          // @ts-ignore
-                          `ui.panel.config.automation.editor.${this._params.type}s.type.${this._params.clipboardItem}.label`
-                        )}
-                      </div>
-                    </div>
-                    ${!this._narrow
-                      ? html`<span class="shortcut">
-                          <span
-                            >${isMac
-                              ? html`<ha-svg-icon
-                                  slot="start"
-                                  .path=${mdiAppleKeyboardCommand}
-                                ></ha-svg-icon>`
-                              : this.hass.localize(
-                                  "ui.panel.config.automation.editor.ctrl"
-                                )}</span
-                          >
-                          <span>+</span>
-                          <span>V</span>
-                        </span>`
-                      : nothing}
-                  </div>
+                  ${this.hass.localize(
+                    `ui.panel.config.automation.editor.${this._params.type}s.paste`
+                  )}
+                  <span slot="supporting-text"
+                    >${this.hass.localize(
+                      // @ts-ignore
+                      `ui.panel.config.automation.editor.${this._params.type}s.type.${this._params.clipboardItem}.label`
+                    )}</span
+                  >
                  <ha-svg-icon
                    slot="start"
                    .path=${mdiContentPaste}
@@ -612,7 +571,7 @@ class DialogAddAutomationElement
                  ><ha-svg-icon slot="end" .path=${mdiPlus}></ha-svg-icon>
                </ha-md-list-item>
                <ha-md-divider role="separator" tabindex="-1"></ha-md-divider>`
-            : nothing}
+            : ""}
          ${repeat(
            items,
            (item) => item.key,
@@ -678,30 +637,6 @@ class DialogAddAutomationElement
    this._filter = ev.detail.value;
  }

-  private _addClipboard = () => {
-    if (this._params?.clipboardItem) {
-      this._params!.add(PASTE_VALUE);
-      showToast(this, {
-        message: this.hass.localize(
-          "ui.panel.config.automation.editor.item_pasted",
-          {
-            item: this.hass.localize(
-              // @ts-ignore
-              `ui.panel.config.automation.editor.${this._params.type}s.type.${this._params.clipboardItem}.label`
-            ),
-          }
-        ),
-      });
-      this.closeDialog();
-    }
-  };
-
-  protected supportedShortcuts(): SupportedShortcuts {
-    return {
-      v: () => this._addClipboard(),
-    };
-  }
-
  static get styles(): CSSResultGroup {
    return [
      haStyle,
@@ -725,7 +660,6 @@ class DialogAddAutomationElement
          max-width: 100vw;
          --md-list-item-leading-space: 24px;
          --md-list-item-trailing-space: 24px;
-          --md-list-item-supporting-text-font: var(--ha-font-size-s);
        }
        ha-md-list-item img {
          width: 24px;
@@ -734,27 +668,6 @@ class DialogAddAutomationElement
          display: block;
          margin: 0 16px;
        }
-        .shortcut-label {
-          display: flex;
-          gap: 12px;
-          justify-content: space-between;
-        }
-        .shortcut-label .supporting-text {
-          color: var(--secondary-text-color);
-          font-size: var(--ha-font-size-s);
-        }
-        .shortcut-label .shortcut {
-          --mdc-icon-size: 12px;
-          display: inline-flex;
-          flex-direction: row;
-          align-items: center;
-          gap: 2px;
-        }
-        .shortcut-label .shortcut span {
-          font-size: var(--ha-font-size-s);
-          font-family: var(--ha-font-family-code);
-          color: var(--ha-color-text-secondary);
-        }
      `,
    ];
  }
--- a/src/panels/config/automation/condition/ha-automation-condition-row.ts
+++ b/src/panels/config/automation/condition/ha-automation-condition-row.ts
@@ -4,12 +4,12 @@ import {
  mdiArrowUp,
  mdiContentCopy,
  mdiContentCut,
+  mdiContentDuplicate,
  mdiDelete,
  mdiDotsVertical,
  mdiFlask,
  mdiPlayCircleOutline,
  mdiPlaylistEdit,
-  mdiPlusCircleMultipleOutline,
  mdiRenameBox,
  mdiStopCircleOutline,
 } from "@mdi/js";
@@ -53,7 +53,6 @@ import {
  showPromptDialog,
 } from "../../../../dialogs/generic/show-dialog-box";
 import type { HomeAssistant } from "../../../../types";
-import { showToast } from "../../../../util/toast";
 import "../ha-automation-editor-warning";
 import { rowStyles } from "../styles";
 import "./ha-automation-condition-editor";
@@ -69,7 +68,6 @@ import "./types/ha-automation-condition-template";
 import "./types/ha-automation-condition-time";
 import "./types/ha-automation-condition-trigger";
 import "./types/ha-automation-condition-zone";
-import { copyToClipboard } from "../../../../common/util/copy-clipboard";

 export interface ConditionElement extends LitElement {
  condition: Condition;
@@ -156,10 +154,6 @@ export default class HaAutomationConditionRow extends LitElement {
  @query("ha-automation-row")
  private _automationRowElement?: HaAutomationRow;

-  get selected() {
-    return this._selected;
-  }
-
  private _renderRow() {
    return html`
      <ha-svg-icon
@@ -220,7 +214,7 @@ export default class HaAutomationConditionRow extends LitElement {
              )}
              <ha-svg-icon
                slot="start"
-                .path=${mdiPlusCircleMultipleOutline}
+                .path=${mdiContentDuplicate}
              ></ha-svg-icon>
            </ha-md-menu-item>

@@ -364,15 +358,12 @@ export default class HaAutomationConditionRow extends LitElement {
              .collapsed=${this._collapsed}
              .selected=${this._selected}
              .highlight=${this.highlight}
+              @click=${this._toggleSidebar}
+              @toggle-collapsed=${this._toggleCollapse}
              .buildingBlock=${CONDITION_BUILDING_BLOCKS.includes(
                this.condition.condition
              )}
              .sortSelected=${this.sortSelected}
-              @click=${this._toggleSidebar}
-              @toggle-collapsed=${this._toggleCollapse}
-              @copy-row=${this._copyCondition}
-              @cut-row=${this._cutCondition}
-              @delete-row=${this._onDelete}
              >${this._renderRow()}</ha-automation-row
            >`
          : html`
@@ -441,7 +432,6 @@ export default class HaAutomationConditionRow extends LitElement {
      ...this._clipboard,
      condition: deepClone(this.condition),
    };
-    copyToClipboard(JSON.stringify(this.condition));
  }

  private _onDisable = () => {
@@ -490,15 +480,6 @@ export default class HaAutomationConditionRow extends LitElement {
    this._testingResult = undefined;
    this._testing = true;
    const condition = this.condition;
-    requestAnimationFrame(() => {
-      // @ts-ignore is supported in all browsers expect firefox
-      if (this.scrollIntoViewIfNeeded) {
-        // @ts-ignore is supported in all browsers expect firefox
-        this.scrollIntoViewIfNeeded();
-        return;
-      }
-      this.scrollIntoView();
-    });

    try {
      const validateResult = await validateConfig(this.hass, {
@@ -589,12 +570,6 @@ export default class HaAutomationConditionRow extends LitElement {

  private _copyCondition = () => {
    this._setClipboard();
-    showToast(this, {
-      message: this.hass.localize(
-        "ui.panel.config.automation.editor.conditions.copied_to_clipboard"
-      ),
-      duration: 2000,
-    });
  };

  private _cutCondition = () => {
@@ -603,12 +578,6 @@ export default class HaAutomationConditionRow extends LitElement {
    if (this._selected) {
      fireEvent(this, "close-sidebar");
    }
-    showToast(this, {
-      message: this.hass.localize(
-        "ui.panel.config.automation.editor.conditions.cut_to_clipboard"
-      ),
-      duration: 2000,
-    });
  };

  private _moveUp = () => {
@@ -728,6 +697,10 @@ export default class HaAutomationConditionRow extends LitElement {
    this._collapsed = !this._collapsed;
  }

+  public isSelected() {
+    return this._selected;
+  }
+
  public focus() {
    this._automationRowElement?.focus();
  }
--- a/src/panels/config/automation/condition/ha-automation-condition.ts
+++ b/src/panels/config/automation/condition/ha-automation-condition.ts
@@ -10,6 +10,7 @@ import { nextRender } from "../../../../common/util/render-status";
 import "../../../../components/ha-button";
 import "../../../../components/ha-button-menu";
 import "../../../../components/ha-sortable";
+import type { HaSortableClonedEventData } from "../../../../components/ha-sortable";
 import "../../../../components/ha-svg-icon";
 import type {
  AutomationClipboard,
@@ -152,6 +153,7 @@ export default class HaAutomationCondition extends LitElement {
        @item-moved=${this._conditionMoved}
        @item-added=${this._conditionAdded}
        @item-removed=${this._conditionRemoved}
+        @item-cloned=${this._conditionCloned}
      >
        <div class="rows ${!this.optionsInSidebar ? "no-sidebar" : ""}">
          ${repeat(
@@ -317,8 +319,11 @@ export default class HaAutomationCondition extends LitElement {
  private async _conditionAdded(ev: CustomEvent): Promise<void> {
    ev.stopPropagation();
    const { index, data } = ev.detail;
-    const item = ev.detail.item as HaAutomationConditionRow;
-    const selected = item.selected;
+    let selected = false;
+    if (data?.["ha-automation-row-selected"]) {
+      selected = true;
+      delete data["ha-automation-row-selected"];
+    }
    let conditions = [
      ...this.conditions.slice(0, index),
      data,
@@ -356,6 +361,12 @@ export default class HaAutomationCondition extends LitElement {
    fireEvent(this, "value-changed", { value: conditions });
  }

+  private _conditionCloned(ev: CustomEvent<HaSortableClonedEventData>) {
+    if (ev.detail.item.isSelected()) {
+      ev.detail.item.condition["ha-automation-row-selected"] = true;
+    }
+  }
+
  private _conditionChanged(ev: CustomEvent) {
    ev.stopPropagation();
    const conditions = [...this.conditions];
--- a/src/panels/config/automation/ha-automation-editor.ts
+++ b/src/panels/config/automation/ha-automation-editor.ts
@@ -1,6 +1,7 @@
 import { consume } from "@lit/context";
 import {
  mdiCog,
+  mdiContentDuplicate,
  mdiContentSave,
  mdiDebugStepOver,
  mdiDelete,
@@ -10,7 +11,6 @@ import {
  mdiPlay,
  mdiPlayCircleOutline,
  mdiPlaylistEdit,
-  mdiPlusCircleMultipleOutline,
  mdiRenameBox,
  mdiRobotConfused,
  mdiStopCircleOutline,
@@ -337,7 +337,7 @@ export class HaAutomationEditor extends PreventUnsavedMixin(
            )}
            <ha-svg-icon
              slot="graphic"
-              .path=${mdiPlusCircleMultipleOutline}
+              .path=${mdiContentDuplicate}
            ></ha-svg-icon>
          </ha-list-item>

@@ -1138,9 +1138,6 @@ export class HaAutomationEditor extends PreventUnsavedMixin(
  protected supportedShortcuts(): SupportedShortcuts {
    return {
      s: () => this._handleSaveAutomation(),
-      c: () => this._copySelectedRow(),
-      x: () => this._cutSelectedRow(),
-      Delete: () => this._deleteSelectedRow(),
    };
  }

@@ -1160,18 +1157,6 @@ export class HaAutomationEditor extends PreventUnsavedMixin(
    this._manualEditor?.expandAll();
  }

-  private _copySelectedRow() {
-    this._manualEditor?.copySelectedRow();
-  }
-
-  private _cutSelectedRow() {
-    this._manualEditor?.cutSelectedRow();
-  }
-
-  private _deleteSelectedRow() {
-    this._manualEditor?.deleteSelectedRow();
-  }
-
  static get styles(): CSSResultGroup {
    return [
      haStyle,
--- a/src/panels/config/automation/ha-automation-sidebar.ts
+++ b/src/panels/config/automation/ha-automation-sidebar.ts
@@ -208,7 +208,6 @@ export default class HaAutomationSidebar extends LitElement {

  static styles = css`
    :host {
-      z-index: 6;
      outline: none;
      height: 100%;
      --ha-card-border-radius: var(
--- a/src/panels/config/automation/manual-automation-editor.ts
+++ b/src/panels/config/automation/manual-automation-editor.ts
@@ -3,13 +3,7 @@ import type { HassEntity } from "home-assistant-js-websocket";
 import { load } from "js-yaml";
 import type { CSSResultGroup, PropertyValues } from "lit";
 import { css, html, LitElement, nothing } from "lit";
-import {
-  customElement,
-  property,
-  query,
-  queryAll,
-  state,
-} from "lit/decorators";
+import { customElement, property, query, state } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
 import {
  any,
@@ -34,7 +28,6 @@ import "../../../components/ha-fab";
 import "../../../components/ha-icon-button";
 import "../../../components/ha-markdown";
 import type {
-  ActionSidebarConfig,
  AutomationConfig,
  Condition,
  ManualAutomationConfig,
@@ -103,11 +96,6 @@ export class HaManualAutomationEditor extends LitElement {

  @query("ha-automation-sidebar") private _sidebarElement?: HaAutomationSidebar;

-  @queryAll("ha-automation-action, ha-automation-condition")
-  private _collapsableElements?: NodeListOf<
-    HaAutomationAction | HaAutomationCondition
-  >;
-
  private _previousConfig?: ManualAutomationConfig;

  public connectedCallback() {
@@ -490,20 +478,7 @@ export class HaManualAutomationEditor extends LitElement {
    if (normalized) {
      ev.preventDefault();

-      if (
-        Object.keys(normalized).length === 1 &&
-        ensureArray(normalized[Object.keys(normalized)[0]]).length === 1
-      ) {
-        this._appendToExistingConfig(normalized);
-        return;
-      }
-
-      if (
-        this.dirty ||
-        ensureArray(this.config.triggers)?.length ||
-        ensureArray(this.config.conditions)?.length ||
-        ensureArray(this.config.actions)?.length
-      ) {
+      if (this.dirty) {
        const result = await new Promise<boolean>((resolve) => {
          showPasteReplaceDialog(this, {
            domain: "automation",
@@ -612,36 +587,24 @@ export class HaManualAutomationEditor extends LitElement {
    });
  }

+  private _getCollapsableElements() {
+    return this.shadowRoot!.querySelectorAll<
+      HaAutomationAction | HaAutomationCondition
+    >("ha-automation-action, ha-automation-condition");
+  }
+
  public expandAll() {
-    this._collapsableElements?.forEach((element) => {
+    this._getCollapsableElements().forEach((element) => {
      element.expandAll();
    });
  }

  public collapseAll() {
-    this._collapsableElements?.forEach((element) => {
+    this._getCollapsableElements().forEach((element) => {
      element.collapseAll();
    });
  }

-  public copySelectedRow() {
-    if ((this._sidebarConfig as ActionSidebarConfig)?.copy) {
-      (this._sidebarConfig as ActionSidebarConfig).copy();
-    }
-  }
-
-  public cutSelectedRow() {
-    if ((this._sidebarConfig as ActionSidebarConfig)?.cut) {
-      (this._sidebarConfig as ActionSidebarConfig).cut();
-    }
-  }
-
-  public deleteSelectedRow() {
-    if ((this._sidebarConfig as ActionSidebarConfig)?.delete) {
-      (this._sidebarConfig as ActionSidebarConfig).delete();
-    }
-  }
-
  static get styles(): CSSResultGroup {
    return [
      saveFabStyles,
--- a/src/panels/config/automation/option/ha-automation-option-row.ts
+++ b/src/panels/config/automation/option/ha-automation-option-row.ts
@@ -2,9 +2,9 @@ import { consume } from "@lit/context";
 import {
  mdiArrowDown,
  mdiArrowUp,
+  mdiContentDuplicate,
  mdiDelete,
  mdiDotsVertical,
-  mdiPlusCircleMultipleOutline,
  mdiRenameBox,
 } from "@mdi/js";
 import type { CSSResultGroup } from "lit";
@@ -86,10 +86,6 @@ export default class HaAutomationOptionRow extends LitElement {
  @query("ha-automation-row")
  private _automationRowElement?: HaAutomationRow;

-  get selected() {
-    return this._selected;
-  }
-
  private _expandedChanged(ev) {
    if (ev.currentTarget.id !== "option") {
      return;
@@ -171,7 +167,7 @@ export default class HaAutomationOptionRow extends LitElement {
                )}
                <ha-svg-icon
                  slot="start"
-                  .path=${mdiPlusCircleMultipleOutline}
+                  .path=${mdiContentDuplicate}
                ></ha-svg-icon>
              </ha-md-menu-item>

@@ -275,10 +271,9 @@ export default class HaAutomationOptionRow extends LitElement {
              left-chevron
              .collapsed=${this._collapsed}
              .selected=${this._selected}
-              .sortSelected=${this.sortSelected}
              @click=${this._toggleSidebar}
              @toggle-collapsed=${this._toggleCollapse}
-              @delete-row=${this._removeOption}
+              .sortSelected=${this.sortSelected}
              >${this._renderRow()}</ha-automation-row
            >`
          : html`
@@ -450,6 +445,10 @@ export default class HaAutomationOptionRow extends LitElement {
    this._collapsed = !this._collapsed;
  }

+  public isSelected() {
+    return this._selected;
+  }
+
  public focus() {
    this._automationRowElement?.focus();
  }
--- a/src/panels/config/automation/option/ha-automation-option.ts
+++ b/src/panels/config/automation/option/ha-automation-option.ts
@@ -9,6 +9,7 @@ import { fireEvent } from "../../../../common/dom/fire_event";
 import { nextRender } from "../../../../common/util/render-status";
 import "../../../../components/ha-button";
 import "../../../../components/ha-sortable";
+import type { HaSortableClonedEventData } from "../../../../components/ha-sortable";
 import "../../../../components/ha-svg-icon";
 import type { AutomationClipboard } from "../../../../data/automation";
 import type { Option } from "../../../../data/script";
@@ -64,6 +65,7 @@ export default class HaAutomationOption extends LitElement {
        @item-moved=${this._optionMoved}
        @item-added=${this._optionAdded}
        @item-removed=${this._optionRemoved}
+        @item-cloned=${this._optionCloned}
      >
        <div class="rows ${!this.optionsInSidebar ? "no-sidebar" : ""}">
          ${repeat(
@@ -239,8 +241,11 @@ export default class HaAutomationOption extends LitElement {
  private async _optionAdded(ev: CustomEvent): Promise<void> {
    ev.stopPropagation();
    const { index, data } = ev.detail;
-    const item = ev.detail.item as HaAutomationOptionRow;
-    const selected = item.selected;
+    let selected = false;
+    if (data?.["ha-automation-row-selected"]) {
+      selected = true;
+      delete data["ha-automation-row-selected"];
+    }

    const options = [
      ...this.options.slice(0, index),
@@ -268,6 +273,12 @@ export default class HaAutomationOption extends LitElement {
    fireEvent(this, "value-changed", { value: options });
  }

+  private _optionCloned(ev: CustomEvent<HaSortableClonedEventData>) {
+    if (ev.detail.item.isSelected()) {
+      ev.detail.item.option["ha-automation-row-selected"] = true;
+    }
+  }
+
  private _optionChanged(ev: CustomEvent) {
    ev.stopPropagation();
    const options = [...this.options];
--- a/src/panels/config/automation/sidebar/ha-automation-sidebar-action.ts
+++ b/src/panels/config/automation/sidebar/ha-automation-sidebar-action.ts
@@ -1,16 +1,15 @@
 import {
-  mdiAppleKeyboardCommand,
  mdiContentCopy,
  mdiContentCut,
+  mdiContentDuplicate,
  mdiDelete,
  mdiPlay,
  mdiPlayCircleOutline,
  mdiPlaylistEdit,
-  mdiPlusCircleMultipleOutline,
  mdiRenameBox,
  mdiStopCircleOutline,
 } from "@mdi/js";
-import { html, LitElement, nothing } from "lit";
+import { html, LitElement } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
 import { keyed } from "lit/directives/keyed";
 import { fireEvent } from "../../../../common/dom/fire_event";
@@ -22,7 +21,6 @@ import { ACTION_BUILDING_BLOCKS } from "../../../../data/action";
 import type { ActionSidebarConfig } from "../../../../data/automation";
 import type { RepeatAction } from "../../../../data/script";
 import type { HomeAssistant } from "../../../../types";
-import { isMac } from "../../../../util/is_mac";
 import type HaAutomationConditionEditor from "../action/ha-automation-action-editor";
 import { getAutomationActionType } from "../action/ha-automation-action-row";
 import { getRepeatType } from "../action/types/ha-automation-action-repeat";
@@ -105,24 +103,18 @@ export default class HaAutomationSidebarAction extends LitElement {
      <span slot="subtitle">${subtitle}</span>

      <ha-md-menu-item slot="menu-items" .clickAction=${this.config.run}>
+        ${this.hass.localize("ui.panel.config.automation.editor.actions.run")}
        <ha-svg-icon slot="start" .path=${mdiPlay}></ha-svg-icon>
-        <div class="overflow-label">
-          ${this.hass.localize("ui.panel.config.automation.editor.actions.run")}
-          <span class="shortcut-placeholder ${isMac ? "mac" : ""}"></span>
-        </div>
      </ha-md-menu-item>
      <ha-md-menu-item
        slot="menu-items"
        .clickAction=${this.config.rename}
        .disabled=${!!disabled}
      >
+        ${this.hass.localize(
+          "ui.panel.config.automation.editor.triggers.rename"
+        )}
        <ha-svg-icon slot="start" .path=${mdiRenameBox}></ha-svg-icon>
-        <div class="overflow-label">
-          ${this.hass.localize(
-            "ui.panel.config.automation.editor.triggers.rename"
-          )}
-          <span class="shortcut-placeholder ${isMac ? "mac" : ""}"></span>
-        </div>
      </ha-md-menu-item>
      <ha-md-divider
        slot="menu-items"
@@ -134,85 +126,36 @@ export default class HaAutomationSidebarAction extends LitElement {
        .clickAction=${this.config.duplicate}
        .disabled=${this.disabled}
      >
-        <ha-svg-icon
-          slot="start"
-          .path=${mdiPlusCircleMultipleOutline}
-        ></ha-svg-icon>
-        <div class="overflow-label">
-          ${this.hass.localize(
-            "ui.panel.config.automation.editor.actions.duplicate"
-          )}
-          <span class="shortcut-placeholder ${isMac ? "mac" : ""}"></span>
-        </div>
+        ${this.hass.localize(
+          "ui.panel.config.automation.editor.actions.duplicate"
+        )}
+        <ha-svg-icon slot="start" .path=${mdiContentDuplicate}></ha-svg-icon>
      </ha-md-menu-item>
      <ha-md-menu-item
        slot="menu-items"
        .clickAction=${this.config.copy}
        .disabled=${this.disabled}
      >
+        ${this.hass.localize("ui.panel.config.automation.editor.triggers.copy")}
        <ha-svg-icon slot="start" .path=${mdiContentCopy}></ha-svg-icon>
-        <div class="overflow-label">
-          ${this.hass.localize(
-            "ui.panel.config.automation.editor.triggers.copy"
-          )}
-          ${!this.narrow
-            ? html`<span class="shortcut">
-                <span
-                  >${isMac
-                    ? html`<ha-svg-icon
-                        slot="start"
-                        .path=${mdiAppleKeyboardCommand}
-                      ></ha-svg-icon>`
-                    : this.hass.localize(
-                        "ui.panel.config.automation.editor.ctrl"
-                      )}</span
-                >
-                <span>+</span>
-                <span>C</span>
-              </span>`
-            : nothing}
-        </div>
      </ha-md-menu-item>
      <ha-md-menu-item
        slot="menu-items"
        .clickAction=${this.config.cut}
        .disabled=${this.disabled}
      >
+        ${this.hass.localize("ui.panel.config.automation.editor.triggers.cut")}
        <ha-svg-icon slot="start" .path=${mdiContentCut}></ha-svg-icon>
-        <div class="overflow-label">
-          ${this.hass.localize(
-            "ui.panel.config.automation.editor.triggers.cut"
-          )}
-          ${!this.narrow
-            ? html`<span class="shortcut">
-                <span
-                  >${isMac
-                    ? html`<ha-svg-icon
-                        slot="start"
-                        .path=${mdiAppleKeyboardCommand}
-                      ></ha-svg-icon>`
-                    : this.hass.localize(
-                        "ui.panel.config.automation.editor.ctrl"
-                      )}</span
-                >
-                <span>+</span>
-                <span>X</span>
-              </span>`
-            : nothing}
-        </div>
      </ha-md-menu-item>
      <ha-md-menu-item
        slot="menu-items"
        .clickAction=${this._toggleYamlMode}
        .disabled=${!this.config.uiSupported || !!this._warnings}
      >
+        ${this.hass.localize(
+          `ui.panel.config.automation.editor.edit_${!this.yamlMode ? "yaml" : "ui"}`
+        )}
        <ha-svg-icon slot="start" .path=${mdiPlaylistEdit}></ha-svg-icon>
-        <div class="overflow-label">
-          ${this.hass.localize(
-            `ui.panel.config.automation.editor.edit_${!this.yamlMode ? "yaml" : "ui"}`
-          )}
-          <span class="shortcut-placeholder ${isMac ? "mac" : ""}"></span>
-        </div>
      </ha-md-menu-item>
      <ha-md-divider
        slot="menu-items"
@@ -220,16 +163,13 @@ export default class HaAutomationSidebarAction extends LitElement {
        tabindex="-1"
      ></ha-md-divider>
      <ha-md-menu-item slot="menu-items" .clickAction=${this.config.disable}>
+        ${this.hass.localize(
+          `ui.panel.config.automation.editor.actions.${disabled ? "enable" : "disable"}`
+        )}
        <ha-svg-icon
          slot="start"
          .path=${this.disabled ? mdiPlayCircleOutline : mdiStopCircleOutline}
        ></ha-svg-icon>
-        <div class="overflow-label">
-          ${this.hass.localize(
-            `ui.panel.config.automation.editor.actions.${disabled ? "enable" : "disable"}`
-          )}
-          <span class="shortcut-placeholder ${isMac ? "mac" : ""}"></span>
-        </div>
      </ha-md-menu-item>
      <ha-md-menu-item
        slot="menu-items"
@@ -237,32 +177,10 @@ export default class HaAutomationSidebarAction extends LitElement {
        .disabled=${this.disabled}
        class="warning"
      >
+        ${this.hass.localize(
+          "ui.panel.config.automation.editor.actions.delete"
+        )}
        <ha-svg-icon slot="start" .path=${mdiDelete}></ha-svg-icon>
-        <div class="overflow-label">
-          ${this.hass.localize(
-            "ui.panel.config.automation.editor.actions.delete"
-          )}
-          ${!this.narrow
-            ? html`<span class="shortcut">
-                <span
-                  >${isMac
-                    ? html`<ha-svg-icon
-                        slot="start"
-                        .path=${mdiAppleKeyboardCommand}
-                      ></ha-svg-icon>`
-                    : this.hass.localize(
-                        "ui.panel.config.automation.editor.ctrl"
-                      )}</span
-                >
-                <span>+</span>
-                <span
-                  >${this.hass.localize(
-                    "ui.panel.config.automation.editor.del"
-                  )}</span
-                >
-              </span>`
-            : nothing}
-        </div>
      </ha-md-menu-item>
      ${description && !this.yamlMode
        ? html`<div class="description">${description}</div>`
--- a/src/panels/config/automation/sidebar/ha-automation-sidebar-card.ts
+++ b/src/panels/config/automation/sidebar/ha-automation-sidebar-card.ts
@@ -1,6 +1,4 @@
-import { ResizeController } from "@lit-labs/observers/resize-controller";
 import { mdiClose, mdiDotsVertical } from "@mdi/js";
-import type { PropertyValues } from "lit";
 import { css, html, LitElement, nothing } from "lit";
 import {
  customElement,
@@ -45,22 +43,7 @@ export default class HaAutomationSidebarCard extends LitElement {

  @state() private _contentScrolled = false;

-  @state() private _contentScrollable = false;
-
-  @query(".card-content") private _contentElement!: HTMLDivElement;
-
-  private _contentSize = new ResizeController(this, {
-    target: null,
-    callback: (entries) => {
-      if (entries[0]?.target) {
-        this._canScrollDown(entries[0].target);
-      }
-    },
-  });
-
-  protected firstUpdated(_changedProperties: PropertyValues): void {
-    this._contentSize.observe(this._contentElement);
-  }
+  @query(".card-content") private _contentElement?: HTMLDivElement;

  protected render() {
    return html`
@@ -111,29 +94,14 @@ export default class HaAutomationSidebarCard extends LitElement {
        <div class="card-content" @scroll=${this._onScroll}>
          <slot></slot>
        </div>
-        ${this.narrow
-          ? html`
-              <div
-                class="fade ${this._contentScrollable ? "scrollable" : ""}"
-              ></div>
-            `
-          : nothing}
      </ha-card>
    `;
  }

  @eventOptions({ passive: true })
-  private _onScroll(ev) {
-    const top = ev.target.scrollTop ?? 0;
+  private _onScroll() {
+    const top = this._contentElement?.scrollTop ?? 0;
    this._contentScrolled = top > 0;
-
-    this._canScrollDown(ev.target);
-  }
-
-  private _canScrollDown(element: HTMLElement) {
-    this._contentScrollable =
-      (element.scrollHeight ?? 0) - (element.clientHeight ?? 0) >
-      (element.scrollTop ?? 0);
  }

  private _closeSidebar() {
@@ -157,7 +125,6 @@ export default class HaAutomationSidebarCard extends LitElement {
    @media all and (max-width: 870px) {
      ha-card.mobile {
        border: none;
-        box-shadow: none;
      }
      ha-card.mobile {
        border-bottom-right-radius: var(--ha-border-radius-square);
@@ -183,20 +150,6 @@ export default class HaAutomationSidebarCard extends LitElement {
      box-shadow: 0 2px 8px rgba(0, 0, 0, 0.12);
    }

-    .fade {
-      position: fixed;
-      bottom: -12px;
-      left: 0;
-      right: 0;
-      height: 12px;
-      pointer-events: none;
-      transition: box-shadow 180ms ease-in-out;
-    }
-
-    .fade.scrollable {
-      box-shadow: 0 -2px 12px rgba(0, 0, 0, 0.16);
-    }
-
    .card-content {
      max-height: calc(100% - 80px);
      overflow: auto;
--- a/src/panels/config/automation/sidebar/ha-automation-sidebar-condition.ts
+++ b/src/panels/config/automation/sidebar/ha-automation-sidebar-condition.ts
@@ -1,30 +1,22 @@
 import {
-  mdiAppleKeyboardCommand,
  mdiContentCopy,
  mdiContentCut,
+  mdiContentDuplicate,
  mdiDelete,
  mdiFlask,
  mdiPlayCircleOutline,
  mdiPlaylistEdit,
-  mdiPlusCircleMultipleOutline,
  mdiRenameBox,
  mdiStopCircleOutline,
 } from "@mdi/js";
-import { css, html, LitElement, nothing } from "lit";
+import { html, LitElement } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
-import { classMap } from "lit/directives/class-map";
 import { keyed } from "lit/directives/keyed";
 import { fireEvent } from "../../../../common/dom/fire_event";
 import { handleStructError } from "../../../../common/structs/handle-errors";
-import {
-  testCondition,
-  type ConditionSidebarConfig,
-} from "../../../../data/automation";
+import type { ConditionSidebarConfig } from "../../../../data/automation";
 import { CONDITION_BUILDING_BLOCKS } from "../../../../data/condition";
-import { validateConfig } from "../../../../data/config";
 import type { HomeAssistant } from "../../../../types";
-import { isMac } from "../../../../util/is_mac";
-import { showAlertDialog } from "../../../lovelace/custom-card-helpers";
 import "../condition/ha-automation-condition-editor";
 import type HaAutomationConditionEditor from "../condition/ha-automation-condition-editor";
 import { sidebarEditorStyles } from "../styles";
@@ -48,10 +40,6 @@ export default class HaAutomationSidebarCondition extends LitElement {

  @state() private _warnings?: string[];

-  @state() private _testing = false;
-
-  @state() private _testingResult?: boolean;
-
  @query(".sidebar-editor")
  public editor?: HaAutomationConditionEditor;

@@ -100,27 +88,21 @@ export default class HaAutomationSidebarCondition extends LitElement {
    >
      <span slot="title">${title}</span>
      <span slot="subtitle">${subtitle}</span>
-      <ha-md-menu-item slot="menu-items" .clickAction=${this._testCondition}>
+      <ha-md-menu-item slot="menu-items" .clickAction=${this.config.test}>
+        ${this.hass.localize(
+          "ui.panel.config.automation.editor.conditions.test"
+        )}
        <ha-svg-icon slot="start" .path=${mdiFlask}></ha-svg-icon>
-        <div class="overflow-label">
-          ${this.hass.localize(
-            "ui.panel.config.automation.editor.conditions.test"
-          )}
-          <span class="shortcut-placeholder ${isMac ? "mac" : ""}"></span>
-        </div>
      </ha-md-menu-item>
      <ha-md-menu-item
        slot="menu-items"
        .clickAction=${this.config.rename}
        .disabled=${!!disabled}
      >
+        ${this.hass.localize(
+          "ui.panel.config.automation.editor.triggers.rename"
+        )}
        <ha-svg-icon slot="start" .path=${mdiRenameBox}></ha-svg-icon>
-        <div class="overflow-label">
-          ${this.hass.localize(
-            "ui.panel.config.automation.editor.triggers.rename"
-          )}
-          <span class="shortcut-placeholder ${isMac ? "mac" : ""}"></span>
-        </div>
      </ha-md-menu-item>

      <ha-md-divider
@@ -134,16 +116,10 @@ export default class HaAutomationSidebarCondition extends LitElement {
        .clickAction=${this.config.duplicate}
        .disabled=${this.disabled}
      >
-        <ha-svg-icon
-          slot="start"
-          .path=${mdiPlusCircleMultipleOutline}
-        ></ha-svg-icon>
-        <div class="overflow-label">
-          ${this.hass.localize(
-            "ui.panel.config.automation.editor.actions.duplicate"
-          )}
-          <span class="shortcut-placeholder ${isMac ? "mac" : ""}"></span>
-        </div>
+        ${this.hass.localize(
+          "ui.panel.config.automation.editor.actions.duplicate"
+        )}
+        <ha-svg-icon slot="start" .path=${mdiContentDuplicate}></ha-svg-icon>
      </ha-md-menu-item>

      <ha-md-menu-item
@@ -151,28 +127,8 @@ export default class HaAutomationSidebarCondition extends LitElement {
        .clickAction=${this.config.copy}
        .disabled=${this.disabled}
      >
+        ${this.hass.localize("ui.panel.config.automation.editor.triggers.copy")}
        <ha-svg-icon slot="start" .path=${mdiContentCopy}></ha-svg-icon>
-        <div class="overflow-label">
-          ${this.hass.localize(
-            "ui.panel.config.automation.editor.triggers.copy"
-          )}
-          ${!this.narrow
-            ? html`<span class="shortcut">
-                <span
-                  >${isMac
-                    ? html`<ha-svg-icon
-                        slot="start"
-                        .path=${mdiAppleKeyboardCommand}
-                      ></ha-svg-icon>`
-                    : this.hass.localize(
-                        "ui.panel.config.automation.editor.ctrl"
-                      )}</span
-                >
-                <span>+</span>
-                <span>C</span>
-              </span>`
-            : nothing}
-        </div>
      </ha-md-menu-item>

      <ha-md-menu-item
@@ -180,41 +136,18 @@ export default class HaAutomationSidebarCondition extends LitElement {
        .clickAction=${this.config.cut}
        .disabled=${this.disabled}
      >
+        ${this.hass.localize("ui.panel.config.automation.editor.triggers.cut")}
        <ha-svg-icon slot="start" .path=${mdiContentCut}></ha-svg-icon>
-        <div class="overflow-label">
-          ${this.hass.localize(
-            "ui.panel.config.automation.editor.triggers.cut"
-          )}
-          ${!this.narrow
-            ? html`<span class="shortcut">
-                <span
-                  >${isMac
-                    ? html`<ha-svg-icon
-                        slot="start"
-                        .path=${mdiAppleKeyboardCommand}
-                      ></ha-svg-icon>`
-                    : this.hass.localize(
-                        "ui.panel.config.automation.editor.ctrl"
-                      )}</span
-                >
-                <span>+</span>
-                <span>X</span>
-              </span>`
-            : nothing}
-        </div>
      </ha-md-menu-item>
      <ha-md-menu-item
        slot="menu-items"
        .clickAction=${this._toggleYamlMode}
        .disabled=${!this.config.uiSupported || !!this._warnings}
      >
+        ${this.hass.localize(
+          `ui.panel.config.automation.editor.edit_${!this.yamlMode ? "yaml" : "ui"}`
+        )}
        <ha-svg-icon slot="start" .path=${mdiPlaylistEdit}></ha-svg-icon>
-        <div class="overflow-label">
-          ${this.hass.localize(
-            `ui.panel.config.automation.editor.edit_${!this.yamlMode ? "yaml" : "ui"}`
-          )}
-          <span class="shortcut-placeholder ${isMac ? "mac" : ""}"></span>
-        </div>
      </ha-md-menu-item>
      <ha-md-divider
        slot="menu-items"
@@ -222,16 +155,13 @@ export default class HaAutomationSidebarCondition extends LitElement {
        tabindex="-1"
      ></ha-md-divider>
      <ha-md-menu-item slot="menu-items" .clickAction=${this.config.disable}>
+        ${this.hass.localize(
+          `ui.panel.config.automation.editor.actions.${disabled ? "enable" : "disable"}`
+        )}
        <ha-svg-icon
          slot="start"
          .path=${this.disabled ? mdiPlayCircleOutline : mdiStopCircleOutline}
        ></ha-svg-icon>
-        <div class="overflow-label">
-          ${this.hass.localize(
-            `ui.panel.config.automation.editor.actions.${disabled ? "enable" : "disable"}`
-          )}
-          <span class="shortcut-placeholder ${isMac ? "mac" : ""}"></span>
-        </div>
      </ha-md-menu-item>
      <ha-md-menu-item
        slot="menu-items"
@@ -239,32 +169,10 @@ export default class HaAutomationSidebarCondition extends LitElement {
        .disabled=${this.disabled}
        class="warning"
      >
+        ${this.hass.localize(
+          "ui.panel.config.automation.editor.actions.delete"
+        )}
        <ha-svg-icon slot="start" .path=${mdiDelete}></ha-svg-icon>
-        <div class="overflow-label">
-          ${this.hass.localize(
-            "ui.panel.config.automation.editor.actions.delete"
-          )}
-          ${!this.narrow
-            ? html`<span class="shortcut">
-                <span
-                  >${isMac
-                    ? html`<ha-svg-icon
-                        slot="start"
-                        .path=${mdiAppleKeyboardCommand}
-                      ></ha-svg-icon>`
-                    : this.hass.localize(
-                        "ui.panel.config.automation.editor.ctrl"
-                      )}</span
-                >
-                <span>+</span>
-                <span
-                  >${this.hass.localize(
-                    "ui.panel.config.automation.editor.del"
-                  )}</span
-                >
-              </span>`
-            : nothing}
-        </div>
      </ha-md-menu-item>
      ${description && !this.yamlMode
        ? html`<div class="description">${description}</div>`
@@ -283,81 +191,9 @@ export default class HaAutomationSidebarCondition extends LitElement {
              sidebar
            ></ha-automation-condition-editor>`
          )}
-      <div
-        class="testing ${classMap({
-          active: this._testing,
-          pass: this._testingResult === true,
-          error: this._testingResult === false,
-        })}"
-      >
-        ${this._testingResult
-          ? this.hass.localize(
-              "ui.panel.config.automation.editor.conditions.testing_pass"
-            )
-          : this.hass.localize(
-              "ui.panel.config.automation.editor.conditions.testing_error"
-            )}
-      </div>
    </ha-automation-sidebar-card>`;
  }

-  private _testCondition = async () => {
-    if (this._testing) {
-      return;
-    }
-    this._testingResult = undefined;
-    this._testing = true;
-    const condition = this.config.config;
-
-    try {
-      const validateResult = await validateConfig(this.hass, {
-        conditions: condition,
-      });
-
-      // Abort if condition changed.
-      if (this.config.config !== condition) {
-        this._testing = false;
-        return;
-      }
-
-      if (!validateResult.conditions.valid) {
-        showAlertDialog(this, {
-          title: this.hass.localize(
-            "ui.panel.config.automation.editor.conditions.invalid_condition"
-          ),
-          text: validateResult.conditions.error,
-        });
-        this._testing = false;
-        return;
-      }
-
-      let result: { result: boolean };
-      try {
-        result = await testCondition(this.hass, condition);
-      } catch (err: any) {
-        if (this.config.config !== condition) {
-          this._testing = false;
-          return;
-        }
-
-        showAlertDialog(this, {
-          title: this.hass.localize(
-            "ui.panel.config.automation.editor.conditions.test_failed"
-          ),
-          text: err.message,
-        });
-        this._testing = false;
-        return;
-      }
-
-      this._testingResult = result.result;
-    } finally {
-      setTimeout(() => {
-        this._testing = false;
-      }, 2500);
-    }
-  };
-
  private _handleUiModeNotAvailable(ev: CustomEvent) {
    this._warnings = handleStructError(this.hass, ev.detail).warnings;
    if (!this.yamlMode) {
@@ -390,47 +226,7 @@ export default class HaAutomationSidebarCondition extends LitElement {
    fireEvent(this, "toggle-yaml-mode");
  };

-  static styles = [
-    sidebarEditorStyles,
-    css`
-      ha-automation-sidebar-card {
-        position: relative;
-      }
-      .testing {
-        position: absolute;
-        z-index: 6;
-        top: 0px;
-        right: 0px;
-        left: 0px;
-        text-transform: uppercase;
-        font-size: var(--ha-font-size-m);
-        font-weight: var(--ha-font-weight-bold);
-        background-color: var(--divider-color, #e0e0e0);
-        color: var(--text-primary-color);
-        max-height: 0px;
-        overflow: hidden;
-        transition: max-height 0.3s;
-        text-align: center;
-        border-top-right-radius: var(
-          --ha-card-border-radius,
-          var(--ha-border-radius-lg)
-        );
-        border-top-left-radius: var(
-          --ha-card-border-radius,
-          var(--ha-border-radius-lg)
-        );
-      }
-      .testing.active {
-        max-height: 100px;
-      }
-      .testing.error {
-        background-color: var(--accent-color);
-      }
-      .testing.pass {
-        background-color: var(--success-color);
-      }
-    `,
-  ];
+  static styles = sidebarEditorStyles;
 }

 declare global {
--- a/src/panels/config/automation/sidebar/ha-automation-sidebar-option.ts
+++ b/src/panels/config/automation/sidebar/ha-automation-sidebar-option.ts
@@ -1,14 +1,8 @@
-import {
-  mdiAppleKeyboardCommand,
-  mdiDelete,
-  mdiPlusCircleMultipleOutline,
-  mdiRenameBox,
-} from "@mdi/js";
-import { html, LitElement, nothing } from "lit";
+import { mdiContentDuplicate, mdiDelete, mdiRenameBox } from "@mdi/js";
+import { html, LitElement } from "lit";
 import { customElement, property, query } from "lit/decorators";
 import type { OptionSidebarConfig } from "../../../../data/automation";
 import type { HomeAssistant } from "../../../../types";
-import { isMac } from "../../../../util/is_mac";
 import type HaAutomationConditionEditor from "../action/ha-automation-action-editor";
 import { sidebarEditorStyles } from "../styles";
 import "./ha-automation-sidebar-card";
@@ -58,13 +52,10 @@ export default class HaAutomationSidebarOption extends LitElement {
              .clickAction=${this.config.rename}
              .disabled=${!!disabled}
            >
+              ${this.hass.localize(
+                "ui.panel.config.automation.editor.triggers.rename"
+              )}
              <ha-svg-icon slot="start" .path=${mdiRenameBox}></ha-svg-icon>
-              <div class="overflow-label">
-                ${this.hass.localize(
-                  "ui.panel.config.automation.editor.triggers.rename"
-                )}
-                <span class="shortcut-placeholder ${isMac ? "mac" : ""}"></span>
-              </div>
            </ha-md-menu-item>

            <ha-md-menu-item
@@ -72,16 +63,13 @@ export default class HaAutomationSidebarOption extends LitElement {
              @click=${this.config.duplicate}
              .disabled=${this.disabled}
            >
+              ${this.hass.localize(
+                "ui.panel.config.automation.editor.actions.duplicate"
+              )}
              <ha-svg-icon
                slot="start"
-                .path=${mdiPlusCircleMultipleOutline}
+                .path=${mdiContentDuplicate}
              ></ha-svg-icon>
-              <div class="overflow-label">
-                ${this.hass.localize(
-                  "ui.panel.config.automation.editor.actions.duplicate"
-                )}
-                <span class="shortcut-placeholder ${isMac ? "mac" : ""}"></span>
-              </div>
            </ha-md-menu-item>
            <ha-md-divider
              slot="menu-items"
@@ -94,32 +82,10 @@ export default class HaAutomationSidebarOption extends LitElement {
              .disabled=${this.disabled}
              class="warning"
            >
+              ${this.hass.localize(
+                "ui.panel.config.automation.editor.actions.type.choose.remove_option"
+              )}
              <ha-svg-icon slot="start" .path=${mdiDelete}></ha-svg-icon>
-              <div class="overflow-label">
-                ${this.hass.localize(
-                  "ui.panel.config.automation.editor.actions.type.choose.remove_option"
-                )}
-                ${!this.narrow
-                  ? html`<span class="shortcut">
-                      <span
-                        >${isMac
-                          ? html`<ha-svg-icon
-                              slot="start"
-                              .path=${mdiAppleKeyboardCommand}
-                            ></ha-svg-icon>`
-                          : this.hass.localize(
-                              "ui.panel.config.automation.editor.ctrl"
-                            )}</span
-                      >
-                      <span>+</span>
-                      <span
-                        >${this.hass.localize(
-                          "ui.panel.config.automation.editor.del"
-                        )}</span
-                      >
-                    </span>`
-                  : nothing}
-              </div>
            </ha-md-menu-item>
          `}

--- a/src/panels/config/automation/sidebar/ha-automation-sidebar-script-field-selector.ts
+++ b/src/panels/config/automation/sidebar/ha-automation-sidebar-script-field-selector.ts
@@ -1,12 +1,11 @@
-import { mdiAppleKeyboardCommand, mdiDelete, mdiPlaylistEdit } from "@mdi/js";
-import { html, LitElement, nothing } from "lit";
+import { mdiDelete, mdiPlaylistEdit } from "@mdi/js";
+import { html, LitElement } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
 import { keyed } from "lit/directives/keyed";
 import { fireEvent } from "../../../../common/dom/fire_event";
 import type { LocalizeKeys } from "../../../../common/translations/localize";
 import type { ScriptFieldSidebarConfig } from "../../../../data/automation";
 import type { HomeAssistant } from "../../../../types";
-import { isMac } from "../../../../util/is_mac";
 import "../../script/ha-script-field-selector-editor";
 import type HaAutomationConditionEditor from "../action/ha-automation-action-editor";
 import { sidebarEditorStyles } from "../styles";
@@ -69,13 +68,10 @@ export default class HaAutomationSidebarScriptFieldSelector extends LitElement {
        .clickAction=${this._toggleYamlMode}
        .disabled=${!!this._warnings}
      >
+        ${this.hass.localize(
+          `ui.panel.config.automation.editor.edit_${!this.yamlMode ? "yaml" : "ui"}`
+        )}
        <ha-svg-icon slot="start" .path=${mdiPlaylistEdit}></ha-svg-icon>
-        <div class="overflow-label">
-          ${this.hass.localize(
-            `ui.panel.config.automation.editor.edit_${!this.yamlMode ? "yaml" : "ui"}`
-          )}
-          <span class="shortcut-placeholder ${isMac ? "mac" : ""}"></span>
-        </div>
      </ha-md-menu-item>
      <ha-md-menu-item
        slot="menu-items"
@@ -83,32 +79,10 @@ export default class HaAutomationSidebarScriptFieldSelector extends LitElement {
        .disabled=${this.disabled}
        class="warning"
      >
+        ${this.hass.localize(
+          "ui.panel.config.automation.editor.actions.delete"
+        )}
        <ha-svg-icon slot="start" .path=${mdiDelete}></ha-svg-icon>
-        <div class="overflow-label">
-          ${this.hass.localize(
-            "ui.panel.config.automation.editor.actions.delete"
-          )}
-          ${!this.narrow
-            ? html`<span class="shortcut">
-                <span
-                  >${isMac
-                    ? html`<ha-svg-icon
-                        slot="start"
-                        .path=${mdiAppleKeyboardCommand}
-                      ></ha-svg-icon>`
-                    : this.hass.localize(
-                        "ui.panel.config.automation.editor.ctrl"
-                      )}</span
-                >
-                <span>+</span>
-                <span
-                  >${this.hass.localize(
-                    "ui.panel.config.automation.editor.del"
-                  )}</span
-                >
-              </span>`
-            : nothing}
-        </div>
      </ha-md-menu-item>
      ${keyed(
        this.sidebarKey,
--- a/src/panels/config/automation/sidebar/ha-automation-sidebar-script-field.ts
+++ b/src/panels/config/automation/sidebar/ha-automation-sidebar-script-field.ts
@@ -1,11 +1,10 @@
-import { mdiAppleKeyboardCommand, mdiDelete, mdiPlaylistEdit } from "@mdi/js";
-import { html, LitElement, nothing } from "lit";
+import { mdiDelete, mdiPlaylistEdit } from "@mdi/js";
+import { html, LitElement } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
 import { keyed } from "lit/directives/keyed";
 import { fireEvent } from "../../../../common/dom/fire_event";
 import type { ScriptFieldSidebarConfig } from "../../../../data/automation";
 import type { HomeAssistant } from "../../../../types";
-import { isMac } from "../../../../util/is_mac";
 import "../../script/ha-script-field-editor";
 import type HaAutomationConditionEditor from "../action/ha-automation-action-editor";
 import { sidebarEditorStyles } from "../styles";
@@ -62,13 +61,10 @@ export default class HaAutomationSidebarScriptField extends LitElement {
        .clickAction=${this._toggleYamlMode}
        .disabled=${!!this._warnings}
      >
+        ${this.hass.localize(
+          `ui.panel.config.automation.editor.edit_${!this.yamlMode ? "yaml" : "ui"}`
+        )}
        <ha-svg-icon slot="start" .path=${mdiPlaylistEdit}></ha-svg-icon>
-        <div class="overflow-label">
-          ${this.hass.localize(
-            `ui.panel.config.automation.editor.edit_${!this.yamlMode ? "yaml" : "ui"}`
-          )}
-          <span class="shortcut-placeholder ${isMac ? "mac" : ""}"></span>
-        </div>
      </ha-md-menu-item>
      <ha-md-menu-item
        slot="menu-items"
@@ -76,32 +72,10 @@ export default class HaAutomationSidebarScriptField extends LitElement {
        .disabled=${this.disabled}
        class="warning"
      >
+        ${this.hass.localize(
+          "ui.panel.config.automation.editor.actions.delete"
+        )}
        <ha-svg-icon slot="start" .path=${mdiDelete}></ha-svg-icon>
-        <div class="overflow-label">
-          ${this.hass.localize(
-            "ui.panel.config.automation.editor.actions.delete"
-          )}
-          ${!this.narrow
-            ? html`<span class="shortcut">
-                <span
-                  >${isMac
-                    ? html`<ha-svg-icon
-                        slot="start"
-                        .path=${mdiAppleKeyboardCommand}
-                      ></ha-svg-icon>`
-                    : this.hass.localize(
-                        "ui.panel.config.automation.editor.ctrl"
-                      )}</span
-                >
-                <span>+</span>
-                <span
-                  >${this.hass.localize(
-                    "ui.panel.config.automation.editor.del"
-                  )}</span
-                >
-              </span>`
-            : nothing}
-        </div>
      </ha-md-menu-item>
      ${keyed(
        this.sidebarKey,
--- a/src/panels/config/automation/sidebar/ha-automation-sidebar-trigger.ts
+++ b/src/panels/config/automation/sidebar/ha-automation-sidebar-trigger.ts
@@ -1,12 +1,11 @@
 import {
-  mdiAppleKeyboardCommand,
  mdiContentCopy,
  mdiContentCut,
+  mdiContentDuplicate,
  mdiDelete,
  mdiIdentifier,
  mdiPlayCircleOutline,
  mdiPlaylistEdit,
-  mdiPlusCircleMultipleOutline,
  mdiRenameBox,
  mdiStopCircleOutline,
 } from "@mdi/js";
@@ -18,7 +17,6 @@ import { handleStructError } from "../../../../common/structs/handle-errors";
 import type { TriggerSidebarConfig } from "../../../../data/automation";
 import { isTriggerList } from "../../../../data/trigger";
 import type { HomeAssistant } from "../../../../types";
-import { isMac } from "../../../../util/is_mac";
 import { sidebarEditorStyles } from "../styles";
 import "../trigger/ha-automation-trigger-editor";
 import type HaAutomationTriggerEditor from "../trigger/ha-automation-trigger-editor";
@@ -91,13 +89,10 @@ export default class HaAutomationSidebarTrigger extends LitElement {
          .clickAction=${this.config.rename}
          .disabled=${disabled || type === "list"}
        >
+          ${this.hass.localize(
+            "ui.panel.config.automation.editor.triggers.rename"
+          )}
          <ha-svg-icon slot="start" .path=${mdiRenameBox}></ha-svg-icon>
-          <div class="overflow-label">
-            ${this.hass.localize(
-              "ui.panel.config.automation.editor.triggers.rename"
-            )}
-            <span class="shortcut-placeholder ${isMac ? "mac" : ""}"></span>
-          </div>
        </ha-md-menu-item>
        ${!this.yamlMode &&
        !("id" in this.config.config) &&
@@ -107,13 +102,10 @@ export default class HaAutomationSidebarTrigger extends LitElement {
              .clickAction=${this._showTriggerId}
              .disabled=${disabled || type === "list"}
            >
+              ${this.hass.localize(
+                "ui.panel.config.automation.editor.triggers.edit_id"
+              )}
              <ha-svg-icon slot="start" .path=${mdiIdentifier}></ha-svg-icon>
-              <div class="overflow-label">
-                ${this.hass.localize(
-                  "ui.panel.config.automation.editor.triggers.edit_id"
-                )}
-                <span class="shortcut-placeholder ${isMac ? "mac" : ""}"></span>
-              </div>
            </ha-md-menu-item>`
          : nothing}

@@ -131,10 +123,7 @@ export default class HaAutomationSidebarTrigger extends LitElement {
          ${this.hass.localize(
            "ui.panel.config.automation.editor.triggers.duplicate"
          )}
-          <ha-svg-icon
-            slot="start"
-            .path=${mdiPlusCircleMultipleOutline}
-          ></ha-svg-icon>
+          <ha-svg-icon slot="start" .path=${mdiContentDuplicate}></ha-svg-icon>
        </ha-md-menu-item>

        <ha-md-menu-item
@@ -142,28 +131,10 @@ export default class HaAutomationSidebarTrigger extends LitElement {
          .clickAction=${this.config.copy}
          .disabled=${this.disabled}
        >
+          ${this.hass.localize(
+            "ui.panel.config.automation.editor.triggers.copy"
+          )}
          <ha-svg-icon slot="start" .path=${mdiContentCopy}></ha-svg-icon>
-          <div class="overflow-label">
-            ${this.hass.localize(
-              "ui.panel.config.automation.editor.triggers.copy"
-            )}
-            ${!this.narrow
-              ? html`<span class="shortcut">
-                  <span
-                    >${isMac
-                      ? html`<ha-svg-icon
-                          slot="start"
-                          .path=${mdiAppleKeyboardCommand}
-                        ></ha-svg-icon>`
-                      : this.hass.localize(
-                          "ui.panel.config.automation.editor.ctrl"
-                        )}</span
-                  >
-                  <span>+</span>
-                  <span>C</span>
-                </span>`
-              : nothing}
-          </div>
        </ha-md-menu-item>

        <ha-md-menu-item
@@ -171,41 +142,20 @@ export default class HaAutomationSidebarTrigger extends LitElement {
          .clickAction=${this.config.cut}
          .disabled=${this.disabled}
        >
+          ${this.hass.localize(
+            "ui.panel.config.automation.editor.triggers.cut"
+          )}
          <ha-svg-icon slot="start" .path=${mdiContentCut}></ha-svg-icon>
-          <div class="overflow-label">
-            ${this.hass.localize(
-              "ui.panel.config.automation.editor.triggers.cut"
-            )}
-            ${!this.narrow
-              ? html`<span class="shortcut">
-                  <span
-                    >${isMac
-                      ? html`<ha-svg-icon
-                          slot="start"
-                          .path=${mdiAppleKeyboardCommand}
-                        ></ha-svg-icon>`
-                      : this.hass.localize(
-                          "ui.panel.config.automation.editor.ctrl"
-                        )}</span
-                  >
-                  <span>+</span>
-                  <span>X</span>
-                </span>`
-              : nothing}
-          </div>
        </ha-md-menu-item>
        <ha-md-menu-item
          slot="menu-items"
          .clickAction=${this._toggleYamlMode}
          .disabled=${!this.config.uiSupported || !!this._warnings}
        >
+          ${this.hass.localize(
+            `ui.panel.config.automation.editor.edit_${!this.yamlMode ? "yaml" : "ui"}`
+          )}
          <ha-svg-icon slot="start" .path=${mdiPlaylistEdit}></ha-svg-icon>
-          <div class="overflow-label">
-            ${this.hass.localize(
-              `ui.panel.config.automation.editor.edit_${!this.yamlMode ? "yaml" : "ui"}`
-            )}
-            <span class="shortcut-placeholder ${isMac ? "mac" : ""}"></span>
-          </div>
        </ha-md-menu-item>
        <ha-md-divider
          slot="menu-items"
@@ -217,16 +167,13 @@ export default class HaAutomationSidebarTrigger extends LitElement {
          .clickAction=${this.config.disable}
          .disabled=${type === "list"}
        >
+          ${this.hass.localize(
+            `ui.panel.config.automation.editor.actions.${disabled ? "enable" : "disable"}`
+          )}
          <ha-svg-icon
            slot="start"
            .path=${this.disabled ? mdiPlayCircleOutline : mdiStopCircleOutline}
          ></ha-svg-icon>
-          <div class="overflow-label">
-            ${this.hass.localize(
-              `ui.panel.config.automation.editor.actions.${disabled ? "enable" : "disable"}`
-            )}
-            <span class="shortcut-placeholder ${isMac ? "mac" : ""}"></span>
-          </div>
        </ha-md-menu-item>
        <ha-md-menu-item
          slot="menu-items"
@@ -234,32 +181,10 @@ export default class HaAutomationSidebarTrigger extends LitElement {
          .disabled=${this.disabled}
          class="warning"
        >
+          ${this.hass.localize(
+            "ui.panel.config.automation.editor.actions.delete"
+          )}
          <ha-svg-icon slot="start" .path=${mdiDelete}></ha-svg-icon>
-          <div class="overflow-label">
-            ${this.hass.localize(
-              "ui.panel.config.automation.editor.actions.delete"
-            )}
-            ${!this.narrow
-              ? html`<span class="shortcut">
-                  <span
-                    >${isMac
-                      ? html`<ha-svg-icon
-                          slot="start"
-                          .path=${mdiAppleKeyboardCommand}
-                        ></ha-svg-icon>`
-                      : this.hass.localize(
-                          "ui.panel.config.automation.editor.ctrl"
-                        )}</span
-                  >
-                  <span>+</span>
-                  <span
-                    >${this.hass.localize(
-                      "ui.panel.config.automation.editor.del"
-                    )}</span
-                  >
-                </span>`
-              : nothing}
-          </div>
        </ha-md-menu-item>
        ${keyed(
          this.sidebarKey,
--- a/src/panels/config/automation/styles.ts
+++ b/src/panels/config/automation/styles.ts
@@ -218,34 +218,4 @@ export const sidebarEditorStyles = css`
  .description {
    padding-top: 16px;
  }
-  .overflow-label {
-    display: flex;
-    justify-content: space-between;
-    gap: 12px;
-    white-space: nowrap;
-  }
-  .overflow-label .shortcut {
-    --mdc-icon-size: 12px;
-    display: inline-flex;
-    flex-direction: row;
-    align-items: center;
-    gap: 2px;
-  }
-  .overflow-label .shortcut span {
-    font-size: var(--ha-font-size-s);
-    font-family: var(--ha-font-family-code);
-    color: var(--ha-color-text-secondary);
-  }
-  .shortcut-placeholder {
-    display: inline-block;
-    width: 60px;
-  }
-  .shortcut-placeholder.mac {
-    width: 46px;
-  }
-  @media all and (max-width: 870px) {
-    .shortcut-placeholder {
-      display: none;
-    }
-  }
 `;
--- a/src/panels/config/automation/trigger/ha-automation-trigger-row.ts
+++ b/src/panels/config/automation/trigger/ha-automation-trigger-row.ts
@@ -4,12 +4,12 @@ import {
  mdiArrowUp,
  mdiContentCopy,
  mdiContentCut,
+  mdiContentDuplicate,
  mdiDelete,
  mdiDotsVertical,
  mdiIdentifier,
  mdiPlayCircleOutline,
  mdiPlaylistEdit,
-  mdiPlusCircleMultipleOutline,
  mdiRenameBox,
  mdiStopCircleOutline,
 } from "@mdi/js";
@@ -52,7 +52,6 @@ import {
  showPromptDialog,
 } from "../../../../dialogs/generic/show-dialog-box";
 import type { HomeAssistant } from "../../../../types";
-import { showToast } from "../../../../util/toast";
 import "../ha-automation-editor-warning";
 import { rowStyles } from "../styles";
 import "./ha-automation-trigger-editor";
@@ -75,7 +74,6 @@ import "./types/ha-automation-trigger-time";
 import "./types/ha-automation-trigger-time_pattern";
 import "./types/ha-automation-trigger-webhook";
 import "./types/ha-automation-trigger-zone";
-import { copyToClipboard } from "../../../../common/util/copy-clipboard";

 export interface TriggerElement extends LitElement {
  trigger: Trigger;
@@ -155,10 +153,6 @@ export default class HaAutomationTriggerRow extends LitElement {
  @consume({ context: fullEntitiesContext, subscribe: true })
  _entityReg!: EntityRegistryEntry[];

-  get selected() {
-    return this._selected;
-  }
-
  private _triggerUnsub?: Promise<UnsubscribeFunc>;

  private _renderRow() {
@@ -227,7 +221,7 @@ export default class HaAutomationTriggerRow extends LitElement {
              )}
              <ha-svg-icon
                slot="start"
-                .path=${mdiPlusCircleMultipleOutline}
+                .path=${mdiContentDuplicate}
              ></ha-svg-icon>
            </ha-md-menu-item>

@@ -355,13 +349,10 @@ export default class HaAutomationTriggerRow extends LitElement {
          ? html`<ha-automation-row
              .disabled=${"enabled" in this.trigger &&
              this.trigger.enabled === false}
+              @click=${this._toggleSidebar}
              .selected=${this._selected}
              .highlight=${this.highlight}
              .sortSelected=${this.sortSelected}
-              @click=${this._toggleSidebar}
-              @copy-row=${this._copyTrigger}
-              @cut-row=${this._cutTrigger}
-              @delete-row=${this._onDelete}
              >${this._selected
                ? "selected"
                : nothing}${this._renderRow()}</ha-automation-row
@@ -534,7 +525,6 @@ export default class HaAutomationTriggerRow extends LitElement {
      ...this._clipboard,
      trigger: this.trigger,
    };
-    copyToClipboard(JSON.stringify(this.trigger));
  }

  private _onDelete = () => {
@@ -644,12 +634,6 @@ export default class HaAutomationTriggerRow extends LitElement {

  private _copyTrigger = () => {
    this._setClipboard();
-    showToast(this, {
-      message: this.hass.localize(
-        "ui.panel.config.automation.editor.triggers.copied_to_clipboard"
-      ),
-      duration: 2000,
-    });
  };

  private _cutTrigger = () => {
@@ -658,12 +642,6 @@ export default class HaAutomationTriggerRow extends LitElement {
    if (this._selected) {
      fireEvent(this, "close-sidebar");
    }
-    showToast(this, {
-      message: this.hass.localize(
-        "ui.panel.config.automation.editor.triggers.cut_to_clipboard"
-      ),
-      duration: 2000,
-    });
  };

  private _moveUp = () => {
@@ -701,6 +679,10 @@ export default class HaAutomationTriggerRow extends LitElement {
      customElements.get(`ha-automation-trigger-${type}`) !== undefined
  );

+  public isSelected() {
+    return this._selected;
+  }
+
  public focus() {
    this._automationRowElement?.focus();
  }
--- a/src/panels/config/automation/trigger/ha-automation-trigger.ts
+++ b/src/panels/config/automation/trigger/ha-automation-trigger.ts
@@ -10,6 +10,7 @@ import { nextRender } from "../../../../common/util/render-status";
 import "../../../../components/ha-button";
 import "../../../../components/ha-button-menu";
 import "../../../../components/ha-sortable";
+import type { HaSortableClonedEventData } from "../../../../components/ha-sortable";
 import "../../../../components/ha-svg-icon";
 import type {
  AutomationClipboard,
@@ -71,6 +72,7 @@ export default class HaAutomationTrigger extends LitElement {
        @item-moved=${this._triggerMoved}
        @item-added=${this._triggerAdded}
        @item-removed=${this._triggerRemoved}
+        @item-cloned=${this._triggerCloned}
      >
        <div class="rows ${!this.optionsInSidebar ? "no-sidebar" : ""}">
          ${repeat(
@@ -258,8 +260,11 @@ export default class HaAutomationTrigger extends LitElement {
  private async _triggerAdded(ev: CustomEvent): Promise<void> {
    ev.stopPropagation();
    const { index, data } = ev.detail;
-    const item = ev.detail.item as HaAutomationTriggerRow;
-    const selected = item.selected;
+    let selected = false;
+    if (data?.["ha-automation-row-selected"]) {
+      selected = true;
+      delete data["ha-automation-row-selected"];
+    }

    let triggers = [
      ...this.triggers.slice(0, index),
@@ -298,6 +303,12 @@ export default class HaAutomationTrigger extends LitElement {
    fireEvent(this, "value-changed", { value: triggers });
  }

+  private _triggerCloned(ev: CustomEvent<HaSortableClonedEventData>) {
+    if (ev.detail.item.isSelected()) {
+      ev.detail.item.trigger["ha-automation-row-selected"] = true;
+    }
+  }
+
  private _triggerChanged(ev: CustomEvent) {
    ev.stopPropagation();
    const triggers = [...this.triggers];
--- a/src/panels/config/automation/trigger/types/ha-automation-trigger-tag.ts
+++ b/src/panels/config/automation/trigger/types/ha-automation-trigger-tag.ts
@@ -42,8 +42,6 @@ export class HaTagTrigger extends LitElement implements TriggerElement {
        .disabled=${this.disabled || this._tags.length === 0}
        .value=${this.trigger.tag_id}
        @selected=${this._tagChanged}
-        fixedMenuPosition
-        naturalMenuWidth
      >
        ${this._tags.map(
          (tag) => html`
--- a/src/panels/config/script/ha-script-editor.ts
+++ b/src/panels/config/script/ha-script-editor.ts
@@ -1,6 +1,7 @@
 import { consume } from "@lit/context";
 import {
  mdiCog,
+  mdiContentDuplicate,
  mdiContentSave,
  mdiDebugStepOver,
  mdiDelete,
@@ -10,7 +11,6 @@ import {
  mdiInformationOutline,
  mdiPlay,
  mdiPlaylistEdit,
-  mdiPlusCircleMultipleOutline,
  mdiRenameBox,
  mdiRobotConfused,
  mdiTag,
@@ -308,7 +308,7 @@ export class HaScriptEditor extends SubscribeMixin(
            )}
            <ha-svg-icon
              slot="graphic"
-              .path=${mdiPlusCircleMultipleOutline}
+              .path=${mdiContentDuplicate}
            ></ha-svg-icon>
          </ha-list-item>

@@ -1047,9 +1047,6 @@ export class HaScriptEditor extends SubscribeMixin(
  protected supportedShortcuts(): SupportedShortcuts {
    return {
      s: () => this._handleSaveScript(),
-      c: () => this._copySelectedRow(),
-      x: () => this._cutSelectedRow(),
-      Delete: () => this._deleteSelectedRow(),
    };
  }

@@ -1069,18 +1066,6 @@ export class HaScriptEditor extends SubscribeMixin(
    this._manualEditor?.expandAll();
  }

-  private _copySelectedRow() {
-    this._manualEditor?.copySelectedRow();
-  }
-
-  private _cutSelectedRow() {
-    this._manualEditor?.cutSelectedRow();
-  }
-
-  private _deleteSelectedRow() {
-    this._manualEditor?.deleteSelectedRow();
-  }
-
  static get styles(): CSSResultGroup {
    return [
      haStyle,
--- a/src/panels/config/script/ha-script-field-row.ts
+++ b/src/panels/config/script/ha-script-field-row.ts
@@ -64,7 +64,6 @@ export default class HaScriptFieldRow extends LitElement {
          @toggle-collapsed=${this._toggleCollapse}
          .collapsed=${this._collapsed}
          .highlight=${this.highlight}
-          @delete-row=${this._onDelete}
        >
          <h3 slot="header">${this.key}</h3>

--- a/src/panels/config/script/manual-script-editor.ts
+++ b/src/panels/config/script/manual-script-editor.ts
@@ -2,13 +2,7 @@ import { mdiContentSave, mdiHelpCircle } from "@mdi/js";
 import { load } from "js-yaml";
 import type { CSSResultGroup, PropertyValues } from "lit";
 import { css, html, LitElement, nothing } from "lit";
-import {
-  customElement,
-  property,
-  query,
-  queryAll,
-  state,
-} from "lit/decorators";
+import { customElement, property, query, state } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
 import {
  any,
@@ -30,10 +24,7 @@ import {
 } from "../../../common/url/search-params";
 import "../../../components/ha-icon-button";
 import "../../../components/ha-markdown";
-import type {
-  ActionSidebarConfig,
-  SidebarConfig,
-} from "../../../data/automation";
+import type { SidebarConfig } from "../../../data/automation";
 import type { Action, Fields, ScriptConfig } from "../../../data/script";
 import {
  getActionType,
@@ -89,11 +80,6 @@ export class HaManualScriptEditor extends LitElement {

  @query("ha-automation-sidebar") private _sidebarElement?: HaAutomationSidebar;

-  @queryAll("ha-automation-action, ha-script-fields")
-  private _collapsableElements?: NodeListOf<
-    HaAutomationAction | HaScriptFields
-  >;
-
  private _previousConfig?: ScriptConfig;

  private _openFields = false;
@@ -371,11 +357,7 @@ export class HaManualScriptEditor extends LitElement {
    if (normalized) {
      ev.preventDefault();

-      if (
-        this.dirty ||
-        ensureArray(this.config.sequence)?.length ||
-        Object.keys(this.config.fields || {}).length
-      ) {
+      if (this.dirty) {
        const result = await new Promise<boolean>((resolve) => {
          showPasteReplaceDialog(this, {
            domain: "script",
@@ -519,36 +501,24 @@ export class HaManualScriptEditor extends LitElement {
    fireEvent(this, "save-script");
  }

+  private _getCollapsableElements() {
+    return this.shadowRoot!.querySelectorAll<
+      HaAutomationAction | HaScriptFields
+    >("ha-automation-action, ha-script-fields");
+  }
+
  public expandAll() {
-    this._collapsableElements?.forEach((element) => {
+    this._getCollapsableElements().forEach((element) => {
      element.expandAll();
    });
  }

  public collapseAll() {
-    this._collapsableElements?.forEach((element) => {
+    this._getCollapsableElements().forEach((element) => {
      element.collapseAll();
    });
  }

-  public copySelectedRow() {
-    if ((this._sidebarConfig as ActionSidebarConfig)?.copy) {
-      (this._sidebarConfig as ActionSidebarConfig).copy();
-    }
-  }
-
-  public cutSelectedRow() {
-    if ((this._sidebarConfig as ActionSidebarConfig)?.cut) {
-      (this._sidebarConfig as ActionSidebarConfig).cut();
-    }
-  }
-
-  public deleteSelectedRow() {
-    if ((this._sidebarConfig as ActionSidebarConfig)?.delete) {
-      (this._sidebarConfig as ActionSidebarConfig).delete();
-    }
-  }
-
  static get styles(): CSSResultGroup {
    return [
      saveFabStyles,
--- a/src/panels/lovelace/cards/hui-home-summary-card.ts
+++ b/src/panels/lovelace/cards/hui-home-summary-card.ts
@@ -119,7 +119,7 @@ export class HuiHomeSummaryCard extends LitElement implements LovelaceCard {

        const sensorsValues = areaSensors
          .map(
-            (entityId) => parseFloat(this.hass!.states[entityId!]?.state) || NaN
+            (entityId) => parseFloat(this.hass!.states[entityId!].state) || NaN
          )
          .filter((value) => !isNaN(value));

--- a/src/panels/lovelace/strategies/home/home-climate-view-strategy.ts
+++ b/src/panels/lovelace/strategies/home/home-climate-view-strategy.ts
@@ -12,11 +12,30 @@ import {
 } from "../areas/helpers/areas-strategy-helper";
 import { getHomeStructure } from "./helpers/home-structure";
 import { findEntities, HOME_SUMMARIES_FILTERS } from "./helpers/home-summaries";
+import { computeStateName } from "../../../../common/entity/compute_state_name";
+import { computeObjectId } from "../../../../common/entity/compute_object_id";

 export interface HomeClimateViewStrategyConfig {
  type: "home-climate";
 }

+const createTempHumidBadge = (hass: HomeAssistant, entityId: string) => {
+  const stateObj = hass.states[entityId];
+  return {
+    type: "tile",
+    entity: entityId,
+    name: stateObj
+      ? computeStateName(stateObj)
+      : computeObjectId(entityId).replace(/_/g, " "),
+    features: [
+      {
+        type: "history-chart",
+        hours_to_show: 3,
+      },
+    ],
+  };
+};
+
 const processAreasForClimate = (
  areaIds: string[],
  hass: HomeAssistant,
@@ -45,17 +64,15 @@ const processAreasForClimate = (
        },
      });

-      if (area.temperature_entity_id) {
-        cards.push({
-          ...computeTileCard(area.temperature_entity_id),
-          features: [{ type: "history-chart" }],
-        });
+      if (hass.areas[areaId].temperature_entity_id) {
+        cards.push(
+          createTempHumidBadge(hass, hass.areas[areaId].temperature_entity_id)
+        );
      }
-      if (area.humidity_entity_id) {
-        cards.push({
-          ...computeTileCard(area.humidity_entity_id),
-          features: [{ type: "history-chart" }],
-        });
+      if (hass.areas[areaId].humidity_entity_id) {
+        cards.push(
+          createTempHumidBadge(hass, hass.areas[areaId].humidity_entity_id)
+        );
      }

      for (const entityId of areaEntities) {
--- a/src/panels/lovelace/strategies/home/home-main-view-strategy.ts
+++ b/src/panels/lovelace/strategies/home/home-main-view-strategy.ts
@@ -207,7 +207,6 @@ export class HomeMainViewStrategy extends ReactiveElement {
            "ui.panel.lovelace.cards.energy.energy_distribution.title_today"
          ),
          type: "energy-distribution",
-          collection_key: "energy_home_dashboard",
          link_dashboard: true,
        });
      }
--- a/src/panels/lovelace/strategies/home/home-security-view-strategy.ts
+++ b/src/panels/lovelace/strategies/home/home-security-view-strategy.ts
@@ -12,6 +12,9 @@ import {
 } from "../areas/helpers/areas-strategy-helper";
 import { getHomeStructure } from "./helpers/home-structure";
 import { findEntities, HOME_SUMMARIES_FILTERS } from "./helpers/home-summaries";
+import { computeDomain } from "../../../../common/entity/compute_domain";
+import { computeStateName } from "../../../../common/entity/compute_state_name";
+import { computeObjectId } from "../../../../common/entity/compute_object_id";

 export interface HomeSecurityViewStrategyConfig {
  type: "home-security";
@@ -46,7 +49,25 @@ const processAreasForSecurity = (
      });

      for (const entityId of areaEntities) {
-        cards.push(computeTileCard(entityId));
+        const stateObj = hass.states[entityId];
+        cards.push(
+          computeDomain(entityId) === "binary_sensor" &&
+            stateObj?.attributes.device_class === "motion"
+            ? {
+                type: "tile",
+                entity: entityId,
+                name: stateObj
+                  ? computeStateName(stateObj)
+                  : computeObjectId(entityId).replace(/_/g, " "),
+                features: [
+                  {
+                    type: "history-chart",
+                    hours_to_show: 6,
+                  },
+                ],
+              }
+            : computeTileCard(entityId)
+        );
      }
    }
  }
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -678,7 +678,7 @@
      },
      "subpage-data-table": {
        "filters": "Filters",
-        "show_results": "Show {number} results",
+        "show_results": "show {number} results",
        "clear_filter": "Clear filter",
        "close_filter": "Close filters",
        "exit_selection_mode": "Exit selection mode",
@@ -1384,11 +1384,6 @@
        "history": "History",
        "logbook": "Activity",
        "device_info": "Device info",
-        "device_or_service_info": "[%key:ui::panel::config::devices::device_info%]",
-        "device_type": {
-          "device": "[%key:ui::panel::config::devices::type::device_heading%]",
-          "service": "[%key:ui::panel::config::devices::type::service_heading%]"
-        },
        "last_changed": "Last changed",
        "last_updated": "Last updated",
        "show_more": "Show more",
@@ -1619,7 +1614,7 @@
            "preload_stream": "Preload camera stream",
            "preload_stream_description": "This keeps the camera stream open in the background so it shows quicker. Warning! This is device intensive.",
            "stream_orientation": "Camera stream orientation",
-            "stream_orientation_description": "The orientation transformation to use for the camera stream.\nWarning: Stream orientation processing occurs on the Home Assistant device and may impact system performance. When possible, configure this setting directly on your camera instead.",
+            "stream_orientation_description": "The orientation transformation to use for the camera stream.",
            "stream_orientation_1": "No orientation transform",
            "stream_orientation_2": "Mirror",
            "stream_orientation_3": "Rotate 180",
@@ -3861,9 +3856,6 @@
            "type_script_plural": "[%key:ui::panel::config::blueprint::overview::types_plural::script%]",
            "new_automation_setup_failed_title": "New {type} setup failed",
            "new_automation_setup_failed_text": "Your new {type} has saved, but waiting for it to setup has timed out. This could be due to errors parsing your configuration.yaml, please check the configuration in developer tools. Your {type} will not be visible until this is corrected, and {types} are reloaded. Changes to area, category, or labels were not saved and must be reapplied.",
-            "item_pasted": "{item} pasted",
-            "ctrl": "Ctrl",
-            "del": "Del",
            "triggers": {
              "name": "Triggers",
              "header": "When",
@@ -3890,8 +3882,6 @@
              "unknown_trigger": "[%key:ui::panel::config::devices::automation::triggers::unknown_trigger%]",
              "triggering_event_detail": "Triggering event detail",
              "trigger": "Trigger",
-              "copied_to_clipboard": "Trigger copied to clipboard",
-              "cut_to_clipboard": "Trigger cut to clipboard",
              "groups": {
                "entity": {
                  "label": "Entity",
@@ -4154,8 +4144,6 @@
              "type_select": "Condition type",
              "unknown_condition": "[%key:ui::panel::config::devices::automation::conditions::unknown_condition%]",
              "condition": "Condition",
-              "copied_to_clipboard": "Condition copied to clipboard",
-              "cut_to_clipboard": "Condition cut to clipboard",
              "groups": {
                "entity": {
                  "label": "Entity",
@@ -4325,8 +4313,6 @@
              "type_select": "Action type",
              "continue_on_error": "Continue on error",
              "action": "Action",
-              "copied_to_clipboard": "Action copied to clipboard",
-              "cut_to_clipboard": "Action cut to clipboard",
              "groups": {
                "helpers": {
                  "label": "Helpers"
--- a/yarn.lock
+++ b/yarn.lock
@@ -4445,10 +4445,10 @@ __metadata:
  languageName: node
  linkType: hard

-"@types/chromecast-caf-receiver@npm:6.0.24":
-  version: 6.0.24
-  resolution: "@types/chromecast-caf-receiver@npm:6.0.24"
-  checksum: 10/1f2b95e8a15dbb36d5328895229d4a5cb255b33e62d46335bd6ed75e16aa9ea6a7d765a64ae120d19b3134fb3e51e9547d2544c7277f7bffe0bf0b3999f026da
+"@types/chromecast-caf-receiver@npm:6.0.22":
+  version: 6.0.22
+  resolution: "@types/chromecast-caf-receiver@npm:6.0.22"
+  checksum: 10/6c51cb52527776ddfa187a261b88184c98bdd61c129dd8719cba213894d565cf69073734d6473696ffd60a768f6fb5a3fe9932693f43174fbc5e7af201db8a90
  languageName: node
  linkType: hard

@@ -9385,7 +9385,7 @@ __metadata:
    "@tsparticles/engine": "npm:3.9.1"
    "@tsparticles/preset-links": "npm:3.2.0"
    "@types/babel__plugin-transform-runtime": "npm:7.9.5"
-    "@types/chromecast-caf-receiver": "npm:6.0.24"
+    "@types/chromecast-caf-receiver": "npm:6.0.22"
    "@types/chromecast-caf-sender": "npm:1.0.11"
    "@types/color-name": "npm:2.0.0"
    "@types/culori": "npm:4.0.0"
Author	SHA1	Message	Date
Bram Kragten	d79d309b96	Change drag selected styling	2025-09-01 17:56:03 +02:00
Bram Kragten	4609d610dc	Update hover and hightlight states for automation rows	2025-09-01 17:28:20 +02:00