diff --git a/src/pages/workorders/form/WorkOrderFormPage.js b/src/pages/workorders/form/WorkOrderFormPage.js
index 88c6ff33..94aa2e32 100644
--- a/src/pages/workorders/form/WorkOrderFormPage.js
+++ b/src/pages/workorders/form/WorkOrderFormPage.js
@@ -67,7 +67,7 @@ export default function WorkOrderFormPage() {
         await addWorkOrder(formData);
         toast.success("Work Order created successfully!");
       }
-      navigate("/workorders");
+      navigate(isEdit ? `/workorders/${id}` : "/workorders");
     } catch (err) {
       console.error(err);
       toast.error("Failed to save work order");
@@ -77,7 +77,7 @@ export default function WorkOrderFormPage() {
   };
 
   const handleCancel = () => {
-    navigate("/workorders");
+    navigate(isEdit ? `/workorders/${id}` : "/workorders");
   };
 
   return (