diff --git a/admin-spa/src/App.tsx b/admin-spa/src/App.tsx
index 40ca763..b3506ae 100644
--- a/admin-spa/src/App.tsx
+++ b/admin-spa/src/App.tsx
@@ -29,6 +29,8 @@ import { useCommandStore } from "@/lib/useCommandStore";
 import SubmenuBar from './components/nav/SubmenuBar';
 import DashboardSubmenuBar from './components/nav/DashboardSubmenuBar';
 import { DashboardProvider } from '@/contexts/DashboardContext';
+import { PageHeaderProvider } from '@/contexts/PageHeaderContext';
+import { PageHeader } from '@/components/PageHeader';
 import { useActiveSection } from '@/hooks/useActiveSection';
 import { NAV_TREE_VERSION } from '@/nav/tree';
 import { __ } from '@/lib/i18n';
@@ -420,6 +422,7 @@ function Shell() {
                 ) : (
                   <SubmenuBar items={main.children} fullscreen={true} />
                 )}
+                <PageHeader />
                 <div className="flex-1 overflow-auto p-4">
                   <AppRoutes />
                 </div>
@@ -434,6 +437,7 @@ function Shell() {
                 <SubmenuBar items={main.children} fullscreen={true} />
               )}
               <main className="flex-1 flex flex-col min-h-0">
+                <PageHeader />
                 <div className="flex-1 overflow-auto p-4">
                   <AppRoutes />
                 </div>
@@ -448,6 +452,7 @@ function Shell() {
             ) : (
               <SubmenuBar items={main.children} fullscreen={false} />
             )}
+            <PageHeader />
             <main className="flex-1 flex flex-col min-h-0">
               <div className="flex-1 overflow-auto p-4">
                 <AppRoutes />
@@ -505,9 +510,11 @@ function AuthWrapper() {
   }
 
   return (
-    <DashboardProvider>
-      <Shell />
-    </DashboardProvider>
+    <PageHeaderProvider>
+      <DashboardProvider>
+        <Shell />
+      </DashboardProvider>
+    </PageHeaderProvider>
   );
 }
 
diff --git a/admin-spa/src/components/PageHeader.tsx b/admin-spa/src/components/PageHeader.tsx
new file mode 100644
index 0000000..6db3e99
--- /dev/null
+++ b/admin-spa/src/components/PageHeader.tsx
@@ -0,0 +1,19 @@
+import React from 'react';
+import { usePageHeader } from '@/contexts/PageHeaderContext';
+
+export function PageHeader() {
+  const { title, action } = usePageHeader();
+
+  if (!title) return null;
+
+  return (
+    <div className="sticky top-[49px] z-10 border-b bg-background/95 backdrop-blur supports-[backdrop-filter]:bg-background/60">
+      <div className="container max-w-5xl mx-auto px-4 py-3 flex items-center justify-between">
+        <div>
+          <h1 className="text-lg font-semibold">{title}</h1>
+        </div>
+        {action && <div>{action}</div>}
+      </div>
+    </div>
+  );
+}
diff --git a/admin-spa/src/contexts/PageHeaderContext.tsx b/admin-spa/src/contexts/PageHeaderContext.tsx
new file mode 100644
index 0000000..041e5ef
--- /dev/null
+++ b/admin-spa/src/contexts/PageHeaderContext.tsx
@@ -0,0 +1,39 @@
+import React, { createContext, useContext, useState, ReactNode } from 'react';
+
+interface PageHeaderContextType {
+  title: string | null;
+  action: ReactNode | null;
+  setPageHeader: (title: string | null, action?: ReactNode) => void;
+  clearPageHeader: () => void;
+}
+
+const PageHeaderContext = createContext<PageHeaderContextType | undefined>(undefined);
+
+export function PageHeaderProvider({ children }: { children: ReactNode }) {
+  const [title, setTitle] = useState<string | null>(null);
+  const [action, setAction] = useState<ReactNode | null>(null);
+
+  const setPageHeader = (newTitle: string | null, newAction?: ReactNode) => {
+    setTitle(newTitle);
+    setAction(newAction || null);
+  };
+
+  const clearPageHeader = () => {
+    setTitle(null);
+    setAction(null);
+  };
+
+  return (
+    <PageHeaderContext.Provider value={{ title, action, setPageHeader, clearPageHeader }}>
+      {children}
+    </PageHeaderContext.Provider>
+  );
+}
+
+export function usePageHeader() {
+  const context = useContext(PageHeaderContext);
+  if (!context) {
+    throw new Error('usePageHeader must be used within PageHeaderProvider');
+  }
+  return context;
+}
diff --git a/admin-spa/src/routes/Settings/components/SettingsLayout.tsx b/admin-spa/src/routes/Settings/components/SettingsLayout.tsx
index a771052..1cf53bb 100644
--- a/admin-spa/src/routes/Settings/components/SettingsLayout.tsx
+++ b/admin-spa/src/routes/Settings/components/SettingsLayout.tsx
@@ -1,6 +1,7 @@
-import React, { useState } from 'react';
+import React, { useState, useEffect } from 'react';
 import { Button } from '@/components/ui/button';
 import { Loader2 } from 'lucide-react';
+import { usePageHeader } from '@/contexts/PageHeaderContext';
 
 interface SettingsLayoutProps {
   title: string;
@@ -22,6 +23,7 @@ export function SettingsLayout({
   action,
 }: SettingsLayoutProps) {
   const [isSaving, setIsSaving] = useState(false);
+  const { setPageHeader, clearPageHeader } = usePageHeader();
 
   const handleSave = async () => {
     if (!onSave) return;
@@ -33,32 +35,35 @@ export function SettingsLayout({
     }
   };
 
+  // Set page header when component mounts
+  useEffect(() => {
+    if (onSave) {
+      setPageHeader(
+        title,
+        <Button
+          onClick={handleSave}
+          disabled={isSaving || isLoading}
+          size="sm"
+        >
+          {isSaving ? (
+            <>
+              <Loader2 className="mr-2 h-4 w-4 animate-spin" />
+              Saving...
+            </>
+          ) : (
+            saveLabel
+          )}
+        </Button>
+      );
+    } else {
+      clearPageHeader();
+    }
+
+    return () => clearPageHeader();
+  }, [title, onSave, isSaving, isLoading, saveLabel]);
+
   return (
     <div className="space-y-6">
-      {/* Sticky Header with Save Button - Edge to edge */}
-      {onSave && (
-        <div className="sticky top-0 z-10 border-b bg-background/95 backdrop-blur supports-[backdrop-filter]:bg-background/60 -mx-4 px-4 mb-6">
-          <div className="container px-0 max-w-5xl mx-auto py-3 flex items-center justify-between">
-            <div>
-              <h1 className="text-lg font-semibold">{title}</h1>
-            </div>
-            <Button
-              onClick={handleSave}
-              disabled={isSaving || isLoading}
-              size="sm"
-            >
-              {isSaving ? (
-                <>
-                  <Loader2 className="mr-2 h-4 w-4 animate-spin" />
-                  Saving...
-                </>
-              ) : (
-                saveLabel
-              )}
-            </Button>
-          </div>
-        </div>
-      )}
 
       {/* Content */}
       <div className="container px-0 max-w-5xl mx-auto">