diff --git a/gallery/src/pages/components/ha-form.ts b/gallery/src/pages/components/ha-form.ts
index 33e288c374..78550489f0 100644
--- a/gallery/src/pages/components/ha-form.ts
+++ b/gallery/src/pages/components/ha-form.ts
@@ -169,7 +169,7 @@ const SCHEMAS: {
   {
     title: "Selectors",
     translations: {
-      addon: "App",
+      app: "App",
       entity: "Entity",
       device: "Device",
       area: "Area",
@@ -188,7 +188,7 @@ const SCHEMAS: {
       entities: "Entities",
     },
     schema: [
-      { name: "addon", selector: { addon: {} } },
+      { name: "app", selector: { app: {} } },
       { name: "entity", selector: { entity: {} } },
       {
         name: "Attribute",
diff --git a/gallery/src/pages/components/ha-selector.ts b/gallery/src/pages/components/ha-selector.ts
index af3fe14207..038c425439 100644
--- a/gallery/src/pages/components/ha-selector.ts
+++ b/gallery/src/pages/components/ha-selector.ts
@@ -239,7 +239,7 @@ const SCHEMAS: {
         selector: { config_entry: {} },
       },
       duration: { name: "Duration", selector: { duration: {} } },
-      addon: { name: "App", selector: { addon: {} } },
+      app: { name: "App", selector: { app: {} } },
       number_box: {
         name: "Number Box",
         selector: {
diff --git a/src/components/ha-selector/ha-selector-addon.ts b/src/components/ha-selector/ha-selector-addon.ts
index fa1968e81f..505acbc1d1 100644
--- a/src/components/ha-selector/ha-selector-addon.ts
+++ b/src/components/ha-selector/ha-selector-addon.ts
@@ -1,42 +1,8 @@
-import { css, html, LitElement } from "lit";
-import { customElement, property } from "lit/decorators";
-import type { AddonSelector } from "../../data/selector";
-import type { HomeAssistant } from "../../types";
-import "../ha-addon-picker";
+import { customElement } from "lit/decorators";
+import { HaAppSelector } from "./ha-selector-app";
 
 @customElement("ha-selector-addon")
-export class HaAddonSelector extends LitElement {
-  @property({ attribute: false }) public hass!: HomeAssistant;
-
-  @property({ attribute: false }) public selector!: AddonSelector;
-
-  @property() public value?: any;
-
-  @property() public label?: string;
-
-  @property() public helper?: string;
-
-  @property({ type: Boolean }) public disabled = false;
-
-  @property({ type: Boolean }) public required = true;
-
-  protected render() {
-    return html`<ha-addon-picker
-      .hass=${this.hass}
-      .value=${this.value}
-      .label=${this.label}
-      .helper=${this.helper}
-      .disabled=${this.disabled}
-      .required=${this.required}
-    ></ha-addon-picker>`;
-  }
-
-  static styles = css`
-    ha-addon-picker {
-      width: 100%;
-    }
-  `;
-}
+export class HaAddonSelector extends HaAppSelector {}
 
 declare global {
   interface HTMLElementTagNameMap {
diff --git a/src/components/ha-selector/ha-selector-app.ts b/src/components/ha-selector/ha-selector-app.ts
index d5b965633d..cc1644788d 100644
--- a/src/components/ha-selector/ha-selector-app.ts
+++ b/src/components/ha-selector/ha-selector-app.ts
@@ -1,6 +1,6 @@
 import { css, html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators";
-import type { AppSelector } from "../../data/selector";
+import type { AppSelector, AddonSelector } from "../../data/selector";
 import type { HomeAssistant } from "../../types";
 import "../ha-addon-picker";
 
@@ -8,7 +8,7 @@ import "../ha-addon-picker";
 export class HaAppSelector extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
-  @property({ attribute: false }) public selector!: AppSelector;
+  @property({ attribute: false }) public selector!: AppSelector | AddonSelector;
 
   @property() public value?: any;
 
diff --git a/src/data/selector.ts b/src/data/selector.ts
index c2ba695c82..f514781cf9 100644
--- a/src/data/selector.ts
+++ b/src/data/selector.ts
@@ -85,10 +85,7 @@ export interface ActionSelector {
 }
 
 export interface AddonSelector {
-  addon: {
-    name?: string;
-    slug?: string;
-  } | null;
+  addon: AppSelector["app"];
 }
 
 export interface AppSelector {