diff --git a/admin-spa/src/routes/Settings/components/SettingsLayout.tsx b/admin-spa/src/routes/Settings/components/SettingsLayout.tsx
index acf3cc1..66d75eb 100644
--- a/admin-spa/src/routes/Settings/components/SettingsLayout.tsx
+++ b/admin-spa/src/routes/Settings/components/SettingsLayout.tsx
@@ -72,7 +72,8 @@ export function SettingsLayout({
 
       {/* Content */}
       <div className="w-full max-w-5xl mx-auto min-w-0">
-        {!onSave && (
+        {/* Only show inline header if NOT using contextual header (no onSave and no action) */}
+        {!onSave && !action && (
           <div className="mb-8">
             <div className="flex items-start justify-between gap-4 min-w-0">
               <div className="min-w-0 flex-1">
@@ -81,7 +82,6 @@ export function SettingsLayout({
                   <p className="text-muted-foreground mt-2">{description}</p>
                 )}
               </div>
-              {action && <div className="shrink-0">{action}</div>}
             </div>
           </div>
         )}