diff --git a/admin-spa/src/routes/Orders/Detail.tsx b/admin-spa/src/routes/Orders/Detail.tsx
index da31409..da172bd 100644
--- a/admin-spa/src/routes/Orders/Detail.tsx
+++ b/admin-spa/src/routes/Orders/Detail.tsx
@@ -142,11 +142,33 @@ export default function OrderShow() {
     retryPaymentMutation.mutate();
   }
 
-  // Hide contextual header on detail page (has its own inline header)
+  // Set contextual header with Back button and Edit action
   useEffect(() => {
-    clearPageHeader();
+    if (!order || isPrintMode) {
+      clearPageHeader();
+      return;
+    }
+
+    const actions = (
+      <div className="flex gap-2">
+        <Button size="sm" variant="ghost" onClick={() => nav('/orders')}>
+          {__('Back')}
+        </Button>
+        <Link to={`/orders/${id}/edit`}>
+          <Button size="sm">
+            {__('Edit')}
+          </Button>
+        </Link>
+      </div>
+    );
+
+    setPageHeader(
+      order.number ? `${__('Order')} #${order.number}` : __('Order'),
+      actions
+    );
+
     return () => clearPageHeader();
-  }, [clearPageHeader]);
+  }, [order, isPrintMode, id, setPageHeader, clearPageHeader, nav]);
 
   useEffect(() => {
     if (!isPrintMode || !qrRef.current || !order) return;
@@ -164,11 +186,8 @@ export default function OrderShow() {
 
   return (
     <div className={`space-y-4 ${mode === 'label' ? 'woonoow-label-mode' : ''}`}>
-      <div className="flex flex-wrap items-center gap-2">
-        <Link className="border rounded-md px-3 py-2 text-sm flex items-center gap-2" to={`/orders`}>
-          <ArrowLeft className="w-4 h-4" /> {__('Back')}
-        </Link>
-        <h2 className="text-lg font-semibold flex-1 min-w-[160px]">{__('Order')} {order?.number ? `#${order.number}` : (id ? `#${id}` : '')}</h2>
+      {/* Desktop extra actions - hidden on mobile, shown on desktop */}
+      <div className="hidden md:flex flex-wrap items-center gap-2">
         <div className="ml-auto flex flex-wrap items-center gap-2">
           <button className="border rounded-md px-3 py-2 text-sm flex items-center gap-2 no-print" onClick={printInvoice} title={__('Print order')}>
             <Printer className="w-4 h-4" /> {__('Print')}
@@ -179,9 +198,6 @@ export default function OrderShow() {
           <button className="border rounded-md px-3 py-2 text-sm flex items-center gap-2 no-print" onClick={printLabel} title={__('Print shipping label')}>
             <Ticket className="w-4 h-4" /> {__('Label')}
           </button>
-          <Link className="border rounded-md px-3 py-2 text-sm flex items-center gap-2 no-print" to={`/orders/${id}/edit`} title={__('Edit order')}>
-            <Pencil className="w-4 h-4" /> {__('Edit')}
-          </Link>
           <Link className="border rounded-md px-3 py-2 text-sm flex items-center gap-2 no-print" to={`/orders`} title={__('Back to orders list')}>
             <ExternalLink className="w-4 h-4" /> {__('Orders')}
           </Link>