diff --git a/src/admin/pages/IssuedOrderDetail.tsx b/src/admin/pages/IssuedOrderDetail.tsx
index 4f35275..8e73ab6 100644
--- a/src/admin/pages/IssuedOrderDetail.tsx
+++ b/src/admin/pages/IssuedOrderDetail.tsx
@@ -534,6 +534,10 @@ export default function IssuedOrderDetail() {
   ]);
   const [errors, setErrors] = useState<Record<string, string>>({});
   const [saving, setSaving] = useState(false);
+  // Which save action is in flight ("draft" | the live status | "save"), so
+  // only the clicked button shows its spinner — `saving` still disables all of
+  // them to prevent a concurrent double-submit.
+  const [savingAction, setSavingAction] = useState<string | null>(null);
   const [dataReady, setDataReady] = useState(false);
   const [poNumber, setPoNumber] = useState("");
 
@@ -733,6 +737,7 @@ export default function IssuedOrderDetail() {
     if (Object.keys(newErrors).length > 0) return;
 
     setSaving(true);
+    setSavingAction(targetStatus ?? "save");
     try {
       const payload: Record<string, unknown> = {
         customer_id: form.customer_id,
@@ -770,10 +775,14 @@ export default function IssuedOrderDetail() {
       alert.success(
         isEdit ? "Objednávka byla uložena" : "Objednávka byla vytvořena",
       );
-      // Finalizing a draft (draft → sent) assigns the PO number server-side;
-      // reflect the new status locally so the form switches out of the draft
-      // button branch (the invalidated query refetch repopulates the number).
-      if (isEdit && targetStatus && targetStatus !== "draft") {
+      // Reflect the just-saved status locally. On CREATE the component is reused
+      // for the redirect to the new order's detail and the one-shot edit-mode
+      // hydration won't re-run (dataReady stays true), so without this the page
+      // would show the stale create-mode status ("draft") even though the order
+      // was created as "sent" — until a manual refresh. On finalize (edit
+      // draft→live) it flips the form out of the draft button branch. The PO
+      // number is repopulated by the detail-query sync effect.
+      if (targetStatus) {
         setForm((prev) => ({ ...prev, status: targetStatus }));
       }
       if (!isEdit) navigate(`/orders/issued/${data.id}`);
@@ -787,6 +796,7 @@ export default function IssuedOrderDetail() {
       );
     } finally {
       setSaving(false);
+      setSavingAction(null);
     }
   };
 
@@ -946,7 +956,7 @@ export default function IssuedOrderDetail() {
                 onClick={() => handleSubmit("draft")}
                 disabled={saving}
               >
-                {saving ? (
+                {savingAction === "draft" ? (
                   <CircularProgress size={16} color="inherit" />
                 ) : (
                   "Uložit koncept"
@@ -956,7 +966,7 @@ export default function IssuedOrderDetail() {
                 onClick={() => handleSubmit(LIVE_STATUS)}
                 disabled={saving}
               >
-                {saving ? (
+                {savingAction === LIVE_STATUS ? (
                   <>
                     <CircularProgress
                       size={16}
@@ -984,7 +994,7 @@ export default function IssuedOrderDetail() {
                 onClick={() => handleSubmit("draft")}
                 disabled={saving}
               >
-                {saving ? (
+                {savingAction === "draft" ? (
                   <CircularProgress size={16} color="inherit" />
                 ) : (
                   "Uložit koncept"
@@ -995,7 +1005,7 @@ export default function IssuedOrderDetail() {
                   onClick={() => handleSubmit(LIVE_STATUS)}
                   disabled={saving}
                 >
-                  {saving ? (
+                  {savingAction === LIVE_STATUS ? (
                     <>
                       <CircularProgress
                         size={16}
@@ -1017,7 +1027,7 @@ export default function IssuedOrderDetail() {
             <>
               {editable && (
                 <Button onClick={() => handleSubmit()} disabled={saving}>
-                  {saving ? (
+                  {savingAction === "save" ? (
                     <>
                       <CircularProgress
                         size={16}