diff --git a/src/orders/components/OrderAddressEditDialog/OrderAddressEditDialog.tsx b/src/orders/components/OrderAddressEditDialog/OrderAddressEditDialog.tsx
index 4a3f10622..1df64b36b 100644
--- a/src/orders/components/OrderAddressEditDialog/OrderAddressEditDialog.tsx
+++ b/src/orders/components/OrderAddressEditDialog/OrderAddressEditDialog.tsx
@@ -80,7 +80,7 @@ const OrderAddressEditDialog: React.FC<OrderAddressEditDialogProps> = props => {
   return (
     <Dialog onClose={onClose} open={open} classes={{ paper: classes.overflow }}>
       <Form initial={address} onSubmit={handleSubmit}>
-        {({ change, data, submit }) => {
+        {({ change, data }) => {
           const handleCountrySelect = createSingleAutocompleteSelectHandler(
             change,
             setCountryDisplayName,
@@ -118,7 +118,6 @@ const OrderAddressEditDialog: React.FC<OrderAddressEditDialogProps> = props => {
                   transitionState={confirmButtonState}
                   color="primary"
                   variant="contained"
-                  onClick={submit}
                   type="submit"
                 >
                   <FormattedMessage {...buttonMessages.confirm} />
diff --git a/src/orders/views/OrderDetails/OrderDetailsMessages.tsx b/src/orders/views/OrderDetails/OrderDetailsMessages.tsx
index f3ff65e5e..fad2cd6ef 100644
--- a/src/orders/views/OrderDetails/OrderDetailsMessages.tsx
+++ b/src/orders/views/OrderDetails/OrderDetailsMessages.tsx
@@ -160,6 +160,7 @@ export const OrderDetailsMessages: React.FC<OrderDetailsMessages> = ({
           defaultMessage: "Order successfully updated"
         })
       });
+      closeModal();
     }
   };
   const handleDraftUpdate = (data: OrderDraftUpdate) => {