diff --git a/src/panels/media-browser/ha-panel-media-browser.ts b/src/panels/media-browser/ha-panel-media-browser.ts
index f0481bd0fd3c..142a7a7ff86a 100644
--- a/src/panels/media-browser/ha-panel-media-browser.ts
+++ b/src/panels/media-browser/ha-panel-media-browser.ts
@@ -2,6 +2,7 @@ import {
   mdiGrid,
   mdiListBoxOutline,
   mdiArrowLeft,
+  mdiAlphaABoxOutline,
   mdiDotsVertical,
 } from "@mdi/js";
 import { ActionDetail } from "@material/mwc-list";
@@ -122,6 +123,16 @@ class PanelMediaBrowser extends LitElement {
             .label=${this.hass.localize("ui.common.menu")}
             .path=${mdiDotsVertical}
           ></ha-icon-button>
+          <mwc-list-item graphic="icon">
+            ${this.hass.localize("ui.components.media-browser.auto")}
+            <ha-svg-icon
+              class=${this._preferredLayout === "auto"
+                ? "selected_menu_item"
+                : ""}
+              slot="graphic"
+              .path=${mdiAlphaABoxOutline}
+            ></ha-svg-icon>
+          </mwc-list-item>
           <mwc-list-item graphic="icon">
             ${this.hass.localize("ui.components.media-browser.grid")}
             <ha-svg-icon
@@ -170,12 +181,13 @@ class PanelMediaBrowser extends LitElement {
   private async _handleMenuAction(ev: CustomEvent<ActionDetail>) {
     switch (ev.detail.index) {
       case 0:
-        this._preferredLayout =
-          this._preferredLayout === "grid" ? "auto" : "grid";
+        this._preferredLayout = "auto";
         break;
       case 1:
-        this._preferredLayout =
-          this._preferredLayout === "list" ? "auto" : "list";
+        this._preferredLayout = "grid";
+        break;
+      case 2:
+        this._preferredLayout = "list";
         break;
     }
   }
diff --git a/src/translations/en.json b/src/translations/en.json
index 3a2a646ab4f2..95601f7fc288 100644
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -704,6 +704,7 @@
           "video": "Video"
         },
         "media_player_unavailable": "The selected media player is unavailable.",
+        "auto": "Auto",
         "grid": "Grid",
         "list": "List"
       },