diff --git a/src/orders/views/OrderDetails/OrderDetailsMessages.tsx b/src/orders/views/OrderDetails/OrderDetailsMessages.tsx
index 81e3bb07a..c32a5d450 100644
--- a/src/orders/views/OrderDetails/OrderDetailsMessages.tsx
+++ b/src/orders/views/OrderDetails/OrderDetailsMessages.tsx
@@ -173,6 +173,7 @@ export const OrderDetailsMessages: React.FC<OrderDetailsMessages> = ({
         })
       });
     }
+    closeModal();
   };
   const handleShippingMethodUpdate = (data: OrderShippingMethodUpdate) => {
     const errs = data.orderUpdateShipping?.errors;
diff --git a/src/orders/views/OrderDetails/index.tsx b/src/orders/views/OrderDetails/index.tsx
index 92b646f42..45e5473d2 100644
--- a/src/orders/views/OrderDetails/index.tsx
+++ b/src/orders/views/OrderDetails/index.tsx
@@ -580,7 +580,11 @@ export const OrderDetails: React.FC<OrderDetailsProps> = ({ id, params }) => {
                       </>
                     )}
                     <OrderAddressEditDialog
-                      confirmButtonState={orderUpdate.opts.status}
+                      confirmButtonState={
+                        order?.status === OrderStatus.DRAFT
+                          ? orderDraftUpdate.opts.status
+                          : orderUpdate.opts.status
+                      }
                       address={transformAddressToForm(order?.shippingAddress)}
                       countries={
                         data?.shop?.countries.map(country => ({
@@ -588,21 +592,33 @@ export const OrderDetails: React.FC<OrderDetailsProps> = ({ id, params }) => {
                           label: country.country
                         })) || []
                       }
-                      errors={orderUpdate.opts.data?.orderUpdate.errors || []}
+                      errors={
+                        (order?.status === OrderStatus.DRAFT
+                          ? orderDraftUpdate.opts.data?.draftOrderUpdate.errors
+                          : orderUpdate.opts.data?.orderUpdate.errors) || []
+                      }
                       open={params.action === "edit-shipping-address"}
                       variant="shipping"
                       onClose={closeModal}
-                      onConfirm={shippingAddress =>
-                        orderUpdate.mutate({
+                      onConfirm={shippingAddress => {
+                        const updateMutation =
+                          order?.status === OrderStatus.DRAFT
+                            ? orderDraftUpdate
+                            : orderUpdate;
+                        updateMutation.mutate({
                           id,
                           input: {
                             shippingAddress
                           }
-                        })
-                      }
+                        });
+                      }}
                     />
                     <OrderAddressEditDialog
-                      confirmButtonState={orderUpdate.opts.status}
+                      confirmButtonState={
+                        order?.status === OrderStatus.DRAFT
+                          ? orderDraftUpdate.opts.status
+                          : orderUpdate.opts.status
+                      }
                       address={transformAddressToForm(order?.billingAddress)}
                       countries={
                         data?.shop?.countries.map(country => ({
@@ -610,18 +626,26 @@ export const OrderDetails: React.FC<OrderDetailsProps> = ({ id, params }) => {
                           label: country.country
                         })) || []
                       }
-                      errors={orderUpdate.opts.data?.orderUpdate.errors || []}
+                      errors={
+                        (order?.status === OrderStatus.DRAFT
+                          ? orderDraftUpdate.opts.data?.draftOrderUpdate.errors
+                          : orderUpdate.opts.data?.orderUpdate.errors) || []
+                      }
                       open={params.action === "edit-billing-address"}
                       variant="billing"
                       onClose={closeModal}
-                      onConfirm={billingAddress =>
-                        orderUpdate.mutate({
+                      onConfirm={billingAddress => {
+                        const updateMutation =
+                          order?.status === OrderStatus.DRAFT
+                            ? orderDraftUpdate
+                            : orderUpdate;
+                        updateMutation.mutate({
                           id,
                           input: {
                             billingAddress
                           }
-                        })
-                      }
+                        });
+                      }}
                     />
                   </>
                 )}