diff --git a/src/components/ha-list-item.ts b/src/components/ha-list-item.ts
index d3481cc192..dcd13f0f70 100644
--- a/src/components/ha-list-item.ts
+++ b/src/components/ha-list-item.ts
@@ -46,6 +46,7 @@ export class HaListItem extends ListItemBase {
         .mdc-deprecated-list-item__meta {
           display: var(--mdc-list-item-meta-display);
           align-items: center;
+          flex-shrink: 0;
         }
         :host([graphic="icon"]:not([twoline]))
           .mdc-deprecated-list-item__graphic {
diff --git a/src/data/action.ts b/src/data/action.ts
index a7ed018409..2c5f2aa125 100644
--- a/src/data/action.ts
+++ b/src/data/action.ts
@@ -67,6 +67,7 @@ export const ACTION_GROUPS: AutomationElementGroup = {
     icon: mdiDotsHorizontal,
     members: {
       event: {},
+      service: {},
     },
   },
 } as const;
diff --git a/src/panels/config/automation/add-automation-element-dialog.ts b/src/panels/config/automation/add-automation-element-dialog.ts
index 6c830976c5..fdf1d97f40 100644
--- a/src/panels/config/automation/add-automation-element-dialog.ts
+++ b/src/panels/config/automation/add-automation-element-dialog.ts
@@ -452,8 +452,8 @@ class DialogAddAutomationElement extends LitElement implements HassDialog {
           itemRoles="option"
           rootTabbable
           style=${styleMap({
-            width: `${this._width}px`,
-            height: `${this._height}px`,
+            width: this._width ? `${this._width}px` : "auto",
+            height: this._height ? `${Math.min(468, this._height)}px` : "auto",
           })}
         >
           ${this._params.clipboardItem &&