diff --git a/client/src/components/Layout/PageSidebar.tsx b/client/src/components/Layout/PageSidebar.tsx
index 7a27577b1..348f549db 100644
--- a/client/src/components/Layout/PageSidebar.tsx
+++ b/client/src/components/Layout/PageSidebar.tsx
@@ -150,7 +150,8 @@ function SidebarInner({
 }): React.ReactElement {
   return (
     <>
-      {sidebarLabel && (
+      {/* Grouped tabs carry their own headings; a page label above the first would stack two. */}
+      {sidebarLabel && !tabs[0]?.group && (
         <div className="mb-1.5 mt-1 px-2.5 font-geist font-bold uppercase tracking-[.08em] text-content-faint" style={{ fontSize: 'calc(9.5px * var(--fs-scale-caption, 1))' }}>
           {sidebarLabel}
         </div>
diff --git a/client/src/components/Settings/settingsKit.tsx b/client/src/components/Settings/settingsKit.tsx
index 9024269e1..914aceaf9 100644
--- a/client/src/components/Settings/settingsKit.tsx
+++ b/client/src/components/Settings/settingsKit.tsx
@@ -103,7 +103,8 @@ export function SettingRow({ label, hint, control, children, stacked = false, di
   return (
     <div className={`px-3.5 py-3 ${dimmed ? 'opacity-60' : ''}`}>
       <div className={stacked ? 'flex flex-col gap-2.5' : 'flex flex-wrap items-center gap-x-4 gap-y-2'}>
-        <div className="min-w-0 flex-1 basis-56">
+        {/* The basis only in a row: in the stacked column it would read as a height. */}
+        <div className={stacked ? 'min-w-0' : 'min-w-0 flex-1 basis-56'}>
           <label htmlFor={htmlFor} className="block font-medium text-content" style={fs(13, 'body')}>{label}</label>
           {hint && <p className="m-0 mt-0.5 leading-snug text-content-faint" style={fs(11.5)}>{hint}</p>}
         </div>