diff --git a/src/app/(protected)/workorders/_components/wizard/use-new-wo-wizard-controller.ts b/src/app/(protected)/workorders/_components/wizard/use-new-wo-wizard-controller.ts
index 9e0476d3..cb988a51 100644
--- a/src/app/(protected)/workorders/_components/wizard/use-new-wo-wizard-controller.ts
+++ b/src/app/(protected)/workorders/_components/wizard/use-new-wo-wizard-controller.ts
@@ -65,9 +65,13 @@ export function useNewWoWizardController({
   };
 
   const createMutation = useCreateWorkOrderFromWizard((createdDraft) => {
-    // Close only after the company-notes save attempt settles; its failures are surfaced
-    // as note-save warnings and must never report the work-order creation as failed.
-    void saveCompanyNotes(createdDraft).finally(() => onOpenChange(false));
+    // Close the dialog first: the work-order create's isPending has already dropped, so
+    // holding the dialog open through the notes save would re-enable Create and unlock
+    // pointer events, and a second click would create a second work order. The save runs
+    // independently of the dialog — fetchCurrentBaseline covers a missing baseline and the
+    // note-save failure toast is surfaced from the mutation itself, not the dialog.
+    onOpenChange(false);
+    void saveCompanyNotes(createdDraft);
   });
   const { duplicateRow, setDuplicateRow, handleDuplicateFound, handleCreate, isCreating } =
     useWizardDuplicateActions({