diff --git a/admin-spa/src/routes/Orders/Detail.tsx b/admin-spa/src/routes/Orders/Detail.tsx
index 0fffeae..da31409 100644
--- a/admin-spa/src/routes/Orders/Detail.tsx
+++ b/admin-spa/src/routes/Orders/Detail.tsx
@@ -142,35 +142,11 @@ export default function OrderShow() {
     retryPaymentMutation.mutate();
   }
 
-  // Set page header with actions
+  // Hide contextual header on detail page (has its own inline header)
   useEffect(() => {
-    if (!order || isPrintMode) {
-      clearPageHeader();
-      return;
-    }
-
-    const actions = (
-      <div className="flex gap-2">
-        <Button size="sm" variant="outline" onClick={printInvoice}>
-          <FileText className="w-4 h-4 mr-1" />
-          {__('Invoice')}
-        </Button>
-        <Link to={`/orders/${id}/edit`}>
-          <Button size="sm">
-            <Pencil className="w-4 h-4 mr-1" />
-            {__('Edit')}
-          </Button>
-        </Link>
-      </div>
-    );
-
-    setPageHeader(
-      order.number ? `${__('Order')} #${order.number}` : __('Order'),
-      actions
-    );
-
+    clearPageHeader();
     return () => clearPageHeader();
-  }, [order, isPrintMode, id, setPageHeader, clearPageHeader]);
+  }, [clearPageHeader]);
 
   useEffect(() => {
     if (!isPrintMode || !qrRef.current || !order) return;
diff --git a/admin-spa/src/routes/Orders/Edit.tsx b/admin-spa/src/routes/Orders/Edit.tsx
index 68f9677..6c1fa1b 100644
--- a/admin-spa/src/routes/Orders/Edit.tsx
+++ b/admin-spa/src/routes/Orders/Edit.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react';
+import React, { useEffect, useRef } from 'react';
 import { useParams, useNavigate } from 'react-router-dom';
 import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query';
 import OrderForm from '@/routes/Orders/partials/OrderForm';
@@ -17,6 +17,7 @@ export default function OrdersEdit() {
   const nav = useNavigate();
   const qc = useQueryClient();
   const { setPageHeader, clearPageHeader } = usePageHeader();
+  const formRef = useRef<HTMLFormElement>(null);
   
   // Hide FAB on edit page
   useFABConfig('none');
@@ -62,19 +63,28 @@ export default function OrdersEdit() {
 
   const order = orderQ.data || {};
 
-  // Set page header with back button
+  // Set page header with back button and save button
   useEffect(() => {
-    const backButton = (
-      <Button size="sm" variant="ghost" onClick={() => nav(`/orders/${orderId}`)}>
-        {__('Back')}
-      </Button>
+    const actions = (
+      <div className="flex gap-2">
+        <Button size="sm" variant="ghost" onClick={() => nav(`/orders/${orderId}`)}>
+          {__('Back')}
+        </Button>
+        <Button 
+          size="sm" 
+          onClick={() => formRef.current?.requestSubmit()}
+          disabled={upd.isPending}
+        >
+          {upd.isPending ? __('Saving...') : __('Save')}
+        </Button>
+      </div>
     );
     const title = order.number 
       ? sprintf(__('Edit Order #%s'), order.number)
       : __('Edit Order');
-    setPageHeader(title, backButton);
+    setPageHeader(title, actions);
     return () => clearPageHeader();
-  }, [order.number, orderId, setPageHeader, clearPageHeader, nav]);
+  }, [order.number, orderId, upd.isPending, setPageHeader, clearPageHeader, nav]);
 
   return (
     <div className="space-y-4">
@@ -91,6 +101,8 @@ export default function OrdersEdit() {
         shippings={(shippingsQ.data || [])}
         itemsEditable={['pending', 'on-hold', 'failed', 'draft'].includes(order.status)}
         showCoupons
+        formRef={formRef}
+        hideSubmitButton={true}
         onSubmit={(form) => {
           const payload = { ...form } as any;
           upd.mutate(payload);
diff --git a/admin-spa/src/routes/Orders/New.tsx b/admin-spa/src/routes/Orders/New.tsx
index b1652e0..92f8bcd 100644
--- a/admin-spa/src/routes/Orders/New.tsx
+++ b/admin-spa/src/routes/Orders/New.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react';
+import React, { useEffect, useRef } from 'react';
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
 import { OrdersApi } from '@/lib/api';
 import { useNavigate } from 'react-router-dom';
@@ -14,6 +14,7 @@ export default function OrdersNew() {
   const nav = useNavigate();
   const qc = useQueryClient();
   const { setPageHeader, clearPageHeader } = usePageHeader();
+  const formRef = useRef<HTMLFormElement>(null);
   
   // Hide FAB on new order page
   useFABConfig('none');
@@ -44,16 +45,25 @@ export default function OrdersNew() {
   // Prefer global store currency injected by PHP
   const { currency: storeCurrency, symbol: storeSymbol } = getStoreCurrency();
 
-  // Set page header with back button
+  // Set page header with back button and create button
   useEffect(() => {
-    const backButton = (
-      <Button size="sm" variant="ghost" onClick={() => nav('/orders')}>
-        {__('Back')}
-      </Button>
+    const actions = (
+      <div className="flex gap-2">
+        <Button size="sm" variant="ghost" onClick={() => nav('/orders')}>
+          {__('Back')}
+        </Button>
+        <Button 
+          size="sm" 
+          onClick={() => formRef.current?.requestSubmit()}
+          disabled={mutate.isPending}
+        >
+          {mutate.isPending ? __('Creating...') : __('Create')}
+        </Button>
+      </div>
     );
-    setPageHeader(__('New Order'), backButton);
+    setPageHeader(__('New Order'), actions);
     return () => clearPageHeader();
-  }, [setPageHeader, clearPageHeader, nav]);
+  }, [mutate.isPending, setPageHeader, clearPageHeader, nav]);
 
   return (
     <div className="space-y-4">
@@ -67,6 +77,8 @@ export default function OrdersNew() {
         defaultCountry={countriesQ.data?.default_country}
         payments={(payments.data || [])}
         shippings={(shippings.data || [])}
+        formRef={formRef}
+        hideSubmitButton={true}
         onSubmit={(form) => {
           mutate.mutate(form as any);
         }}
diff --git a/admin-spa/src/routes/Orders/partials/OrderForm.tsx b/admin-spa/src/routes/Orders/partials/OrderForm.tsx
index c7b6f58..e45bae9 100644
--- a/admin-spa/src/routes/Orders/partials/OrderForm.tsx
+++ b/admin-spa/src/routes/Orders/partials/OrderForm.tsx
@@ -92,6 +92,8 @@ type Props = {
   rightTop?: React.ReactNode;
   itemsEditable?: boolean;
   showCoupons?: boolean;
+  formRef?: React.RefObject<HTMLFormElement>;
+  hideSubmitButton?: boolean;
 };
 
 const STATUS_LIST = ['pending','processing','on-hold','completed','cancelled','refunded','failed'];
@@ -113,6 +115,8 @@ export default function OrderForm({
   showCoupons = true,
   currency,
   currencySymbol,
+  formRef,
+  hideSubmitButton = false,
 }: Props) {
   const oneCountryOnly = countries.length === 1;
   const firstCountry = countries[0]?.code || 'US';
@@ -346,7 +350,7 @@ export default function OrderForm({
   }
 
   return (
-    <form onSubmit={handleSubmit} className={cn('grid grid-cols-1 lg:grid-cols-3 gap-6', className)}>
+    <form ref={formRef} onSubmit={handleSubmit} className={cn('grid grid-cols-1 lg:grid-cols-3 gap-6', className)}>
       {/* Left: Order details */}
       <div className="lg:col-span-2 space-y-6">
         {/* Items and Coupons */}
@@ -933,9 +937,11 @@ export default function OrderForm({
             </div>
           )}
 
-          <Button type="submit" disabled={submitting} className="w-full">
-            {submitting ? (mode === 'edit' ? __('Saving…') : __('Creating…')) : (mode === 'edit' ? __('Save changes') : __('Create order'))}
-          </Button>
+          {!hideSubmitButton && (
+            <Button type="submit" disabled={submitting} className="w-full">
+              {submitting ? (mode === 'edit' ? __('Saving…') : __('Creating…')) : (mode === 'edit' ? __('Save changes') : __('Create order'))}
+            </Button>
+          )}
         </div>
       </aside>
     </form>