diff --git a/src/components/ha-grid-size-picker.ts b/src/components/ha-grid-size-picker.ts
index 30fdf1a9f9..c7c15df287 100644
--- a/src/components/ha-grid-size-picker.ts
+++ b/src/components/ha-grid-size-picker.ts
@@ -213,7 +213,7 @@ export class HaGridSizeEditor extends LitElement {
         grid-template-areas:
           "reset column-slider"
           "row-slider preview";
-        grid-template-rows: auto 1fr;
+        grid-template-rows: auto auto;
         grid-template-columns: auto 1fr;
         gap: 8px;
       }
@@ -229,17 +229,12 @@ export class HaGridSizeEditor extends LitElement {
       .preview {
         position: relative;
         grid-area: preview;
-        aspect-ratio: 1 / 1.2;
       }
       .preview > div {
-        position: absolute;
-        width: 100%;
-        height: 100%;
-        top: 0;
-        left: 0;
+        position: relative;
         display: grid;
         grid-template-columns: repeat(var(--total-columns), 1fr);
-        grid-template-rows: repeat(var(--total-rows), 1fr);
+        grid-template-rows: repeat(var(--total-rows), 25px);
         gap: 4px;
       }
       .preview .cell {
@@ -250,8 +245,13 @@ export class HaGridSizeEditor extends LitElement {
         opacity: 0.2;
         cursor: pointer;
       }
-      .selected {
+      .preview .selected {
+        position: absolute;
         pointer-events: none;
+        top: 0;
+        left: 0;
+        height: 100%;
+        width: 100%;
       }
       .selected .cell {
         background-color: var(--primary-color);
diff --git a/src/panels/lovelace/editor/card-editor/hui-card-element-editor.ts b/src/panels/lovelace/editor/card-editor/hui-card-element-editor.ts
index 17320765cf..8e605b12d4 100644
--- a/src/panels/lovelace/editor/card-editor/hui-card-element-editor.ts
+++ b/src/panels/lovelace/editor/card-editor/hui-card-element-editor.ts
@@ -8,6 +8,7 @@ import type { LovelaceCardEditor, LovelaceConfigForm } from "../../types";
 import { HuiElementEditor } from "../hui-element-editor";
 import "./hui-card-layout-editor";
 import "./hui-card-visibility-editor";
+import { LovelaceSectionConfig } from "../../../../data/lovelace/config/section";
 
 const tabs = ["config", "visibility", "layout"] as const;
 
@@ -16,8 +17,7 @@ export class HuiCardElementEditor extends HuiElementEditor<LovelaceCardConfig> {
   @property({ type: Boolean, attribute: "show-visibility-tab" })
   public showVisibilityTab = false;
 
-  @property({ type: Boolean, attribute: "show-layout-tab" })
-  public showLayoutTab = false;
+  @property({ attribute: false }) public sectionConfig?: LovelaceSectionConfig;
 
   @state() private _currTab: (typeof tabs)[number] = tabs[0];
 
@@ -48,10 +48,18 @@ export class HuiCardElementEditor extends HuiElementEditor<LovelaceCardConfig> {
     this.value = ev.detail.value;
   }
 
+  get _showLayoutTab(): boolean {
+    return (
+      !!this.sectionConfig &&
+      (this.sectionConfig.type === undefined ||
+        this.sectionConfig.type === "grid")
+    );
+  }
+
   protected renderConfigElement(): TemplateResult {
     const displayedTabs: string[] = ["config"];
     if (this.showVisibilityTab) displayedTabs.push("visibility");
-    if (this.showLayoutTab) displayedTabs.push("layout");
+    if (this._showLayoutTab) displayedTabs.push("layout");
 
     if (displayedTabs.length === 1) return super.renderConfigElement();
 
@@ -75,6 +83,7 @@ export class HuiCardElementEditor extends HuiElementEditor<LovelaceCardConfig> {
           <hui-card-layout-editor
             .hass=${this.hass}
             .config=${this.value}
+            .sectionConfig=${this.sectionConfig!}
             @value-changed=${this._configChanged}
           >
           </hui-card-layout-editor>
diff --git a/src/panels/lovelace/editor/card-editor/hui-card-layout-editor.ts b/src/panels/lovelace/editor/card-editor/hui-card-layout-editor.ts
index d944d94609..8a4dcd782a 100644
--- a/src/panels/lovelace/editor/card-editor/hui-card-layout-editor.ts
+++ b/src/panels/lovelace/editor/card-editor/hui-card-layout-editor.ts
@@ -2,13 +2,13 @@ import type { ActionDetail } from "@material/mwc-list";
 import { mdiCheck, mdiDotsVertical } from "@mdi/js";
 import { css, html, LitElement, nothing, PropertyValues } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
+import { styleMap } from "lit/directives/style-map";
 import memoizeOne from "memoize-one";
 import { fireEvent } from "../../../../common/dom/fire_event";
 import { preventDefault } from "../../../../common/dom/prevent_default";
 import { stopPropagation } from "../../../../common/dom/stop_propagation";
 import "../../../../components/ha-button";
 import "../../../../components/ha-button-menu";
-import "../../../../components/ha-formfield";
 import "../../../../components/ha-grid-size-picker";
 import "../../../../components/ha-icon-button";
 import "../../../../components/ha-list-item";
@@ -19,6 +19,7 @@ import "../../../../components/ha-switch";
 import "../../../../components/ha-yaml-editor";
 import type { HaYamlEditor } from "../../../../components/ha-yaml-editor";
 import { LovelaceCardConfig } from "../../../../data/lovelace/config/card";
+import { LovelaceSectionConfig } from "../../../../data/lovelace/config/section";
 import { haStyle } from "../../../../resources/styles";
 import { HomeAssistant } from "../../../../types";
 import { HuiCard } from "../../cards/hui-card";
@@ -34,6 +35,8 @@ export class HuiCardLayoutEditor extends LitElement {
 
   @property({ attribute: false }) public config!: LovelaceCardConfig;
 
+  @property({ attribute: false }) public sectionConfig!: LovelaceSectionConfig;
+
   @state() _defaultLayoutOptions?: LovelaceLayoutOptions;
 
   @state() public _yamlMode = false;
@@ -69,6 +72,8 @@ export class HuiCardLayoutEditor extends LitElement {
 
     const value = this._computeCardGridSize(options);
 
+    const totalColumns = (this.sectionConfig.column_span ?? 1) * 4;
+
     return html`
       <div class="header">
         <p class="intro">
@@ -131,6 +136,10 @@ export class HuiCardLayoutEditor extends LitElement {
           `
         : html`
             <ha-grid-size-picker
+              style=${styleMap({
+                "max-width": `${totalColumns * 45 + 50}px`,
+              })}
+              .columns=${totalColumns}
               .hass=${this.hass}
               .value=${value}
               .isDefault=${this._isDefault(this.config.layout_options)}
@@ -292,20 +301,12 @@ export class HuiCardLayoutEditor extends LitElement {
       }
       ha-grid-size-picker {
         display: block;
-        max-width: 250px;
         margin: 16px auto;
       }
       ha-yaml-editor {
         display: block;
         margin: 16px 0;
       }
-      ha-formfield {
-        display: flex;
-        align-items: center;
-        --mdc-typography-body2-font-size: 1em;
-        max-width: 250px;
-        margin: 16px auto;
-      }
     `,
   ];
 }
diff --git a/src/panels/lovelace/editor/card-editor/hui-dialog-edit-card.ts b/src/panels/lovelace/editor/card-editor/hui-dialog-edit-card.ts
index 9b3c3aa9d1..96779a34cc 100644
--- a/src/panels/lovelace/editor/card-editor/hui-dialog-edit-card.ts
+++ b/src/panels/lovelace/editor/card-editor/hui-dialog-edit-card.ts
@@ -236,8 +236,10 @@ export class HuiDialogEditCard
         <div class="content">
           <div class="element-editor">
             <hui-card-element-editor
-              .showLayoutTab=${this._shouldShowLayoutTab()}
               .showVisibilityTab=${this._cardConfig?.type !== "conditional"}
+              .sectionConfig=${this._isInSection
+                ? this._containerConfig
+                : undefined}
               .hass=${this.hass}
               .lovelace=${this._params.lovelaceConfig}
               .value=${this._cardConfig}
@@ -353,18 +355,6 @@ export class HuiDialogEditCard
     return this._params!.path.length === 2;
   }
 
-  private _shouldShowLayoutTab(): boolean {
-    /**
-     * Only show layout tab for cards in a grid section
-     * In the future, every section and view should be able to bring their own editor for layout.
-     * For now, we limit it to grid sections as it's the only section type
-     * */
-    return (
-      this._isInSection &&
-      (!this._containerConfig.type || this._containerConfig.type === "grid")
-    );
-  }
-
   private _cardConfigInSection = memoizeOne(
     (cardConfig?: LovelaceCardConfig) => {
       const { cards, title, ...containerConfig } = this
diff --git a/src/panels/lovelace/editor/section-editor/hui-dialog-edit-section.ts b/src/panels/lovelace/editor/section-editor/hui-dialog-edit-section.ts
index 91ab6c3f2f..7801e58a3d 100644
--- a/src/panels/lovelace/editor/section-editor/hui-dialog-edit-section.ts
+++ b/src/panels/lovelace/editor/section-editor/hui-dialog-edit-section.ts
@@ -35,6 +35,7 @@ import "./hui-section-visibility-editor";
 import type { EditSectionDialogParams } from "./show-edit-section-dialog";
 import "@material/mwc-tab-bar/mwc-tab-bar";
 import "@material/mwc-tab/mwc-tab";
+import { LovelaceViewConfig } from "../../../../data/lovelace/config/view";
 
 const TABS = ["tab-settings", "tab-visibility"] as const;
 
@@ -49,6 +50,8 @@ export class HuiDialogEditSection
 
   @state() private _config?: LovelaceSectionRawConfig;
 
+  @state() private _viewConfig?: LovelaceViewConfig;
+
   @state() private _yamlMode = false;
 
   @state() private _currTab: (typeof TABS)[number] = TABS[0];
@@ -57,10 +60,10 @@ export class HuiDialogEditSection
 
   protected updated(changedProperties: PropertyValues) {
     if (this._yamlMode && changedProperties.has("_yamlMode")) {
-      const viewConfig = {
+      const sectionConfig = {
         ...this._config,
       };
-      this._editor?.setValue(viewConfig);
+      this._editor?.setValue(sectionConfig);
     }
   }
 
@@ -71,6 +74,9 @@ export class HuiDialogEditSection
       this._params.viewIndex,
       this._params.sectionIndex,
     ]);
+    this._viewConfig = findLovelaceContainer(this._params.lovelaceConfig, [
+      this._params.viewIndex,
+    ]);
   }
 
   public closeDialog() {
@@ -107,6 +113,7 @@ export class HuiDialogEditSection
             <hui-section-settings-editor
               .hass=${this.hass}
               .config=${this._config}
+              .viewConfig=${this._viewConfig}
               @value-changed=${this._configChanged}
             >
             </hui-section-settings-editor>
diff --git a/src/panels/lovelace/editor/section-editor/hui-section-settings-editor.ts b/src/panels/lovelace/editor/section-editor/hui-section-settings-editor.ts
index 70a74fdc2c..949d57941b 100644
--- a/src/panels/lovelace/editor/section-editor/hui-section-settings-editor.ts
+++ b/src/panels/lovelace/editor/section-editor/hui-section-settings-editor.ts
@@ -1,23 +1,15 @@
 import { LitElement, html } from "lit";
 import { customElement, property } from "lit/decorators";
-import { LovelaceSectionRawConfig } from "../../../../data/lovelace/config/section";
-import { HomeAssistant } from "../../../../types";
+import memoizeOne from "memoize-one";
+import { fireEvent } from "../../../../common/dom/fire_event";
+import { LocalizeFunc } from "../../../../common/translations/localize";
 import {
   HaFormSchema,
   SchemaUnion,
 } from "../../../../components/ha-form/types";
-import { fireEvent } from "../../../../common/dom/fire_event";
-
-const SCHEMA = [
-  {
-    name: "title",
-    selector: { text: {} },
-  },
-  {
-    name: "column_span",
-    selector: { number: { min: 1, max: 3 } },
-  },
-] as const satisfies HaFormSchema[];
+import { LovelaceSectionRawConfig } from "../../../../data/lovelace/config/section";
+import { LovelaceViewConfig } from "../../../../data/lovelace/config/view";
+import { HomeAssistant } from "../../../../types";
 
 type SettingsData = {
   title: string;
@@ -30,17 +22,46 @@ export class HuiDialogEditSection extends LitElement {
 
   @property({ attribute: false }) public config!: LovelaceSectionRawConfig;
 
+  @property({ attribute: false }) public viewConfig!: LovelaceViewConfig;
+
+  private _schema = memoizeOne(
+    (localize: LocalizeFunc, maxColumns: number) =>
+      [
+        {
+          name: "title",
+          selector: { text: {} },
+        },
+        {
+          name: "column_span",
+          selector: {
+            number: {
+              min: 1,
+              max: maxColumns,
+              unit_of_measurement: localize(
+                `ui.panel.lovelace.editor.edit_section.settings.column_span_unit`
+              ),
+            },
+          },
+        },
+      ] as const satisfies HaFormSchema[]
+  );
+
   render() {
     const data: SettingsData = {
       title: this.config.title || "",
       column_span: this.config.column_span || 1,
     };
 
+    const schema = this._schema(
+      this.hass.localize,
+      this.viewConfig.max_columns || 4
+    );
+
     return html`
       <ha-form
         .hass=${this.hass}
         .data=${data}
-        .schema=${SCHEMA}
+        .schema=${schema}
         .computeLabel=${this._computeLabel}
         .computeHelper=${this._computeHelper}
         @value-changed=${this._valueChanged}
@@ -48,12 +69,16 @@ export class HuiDialogEditSection extends LitElement {
     `;
   }
 
-  private _computeLabel = (schema: SchemaUnion<typeof SCHEMA>) =>
+  private _computeLabel = (
+    schema: SchemaUnion<ReturnType<typeof this._schema>>
+  ) =>
     this.hass.localize(
       `ui.panel.lovelace.editor.edit_section.settings.${schema.name}`
     );
 
-  private _computeHelper = (schema: SchemaUnion<typeof SCHEMA>) =>
+  private _computeHelper = (
+    schema: SchemaUnion<ReturnType<typeof this._schema>>
+  ) =>
     this.hass.localize(
       `ui.panel.lovelace.editor.edit_section.settings.${schema.name}_helper`
     ) || "";
diff --git a/src/translations/en.json b/src/translations/en.json
index 1f5f07b145..77de1293d1 100644
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -5661,7 +5661,10 @@
             "edit_yaml": "[%key:ui::panel::lovelace::editor::edit_view::edit_yaml%]",
             "settings": {
               "title": "Title",
-              "title_helper": "The title will appear at the top of section. Leave empty to hide the title."
+              "title_helper": "The title will appear at the top of section. Leave empty to hide the title.",
+              "column_span": "Size",
+              "column_span_unit": "columns",
+              "column_span_helper": "The size may be smaller if less columns are displayed (e.g. on mobile devices)."
             },
             "visibility": {
               "explanation": "The section will be shown when ALL conditions below are fulfilled. If no conditions are set, the section will always be shown."