diff --git a/src/orders/components/OrderCustomerAddressesEditDialog/OrderCustomerAddressEdit.tsx b/src/orders/components/OrderCustomerAddressesEditDialog/OrderCustomerAddressEdit.tsx
index 1ca43f29a..637945ac2 100644
--- a/src/orders/components/OrderCustomerAddressesEditDialog/OrderCustomerAddressEdit.tsx
+++ b/src/orders/components/OrderCustomerAddressesEditDialog/OrderCustomerAddressEdit.tsx
@@ -92,7 +92,7 @@ const OrderCustomerAddressEdit: React.FC<OrderCustomerAddressEditProps> = props
         className={classes.optionLabel}
       />
       {addressInputOption === AddressInputOptionEnum.CUSTOMER_ADDRESS && (
-        <>
+        <div className={classes.scrollableWrapper}>
           {customerAddresses.map(customerAddress => (
             <React.Fragment key={customerAddress.id}>
               <CardSpacer />
@@ -104,7 +104,7 @@ const OrderCustomerAddressEdit: React.FC<OrderCustomerAddressEditProps> = props
             </React.Fragment>
           ))}
           <FormSpacer />
-        </>
+        </div>
       )}
       <FormControlLabel
         value={AddressInputOptionEnum.NEW_ADDRESS}
diff --git a/src/orders/components/OrderCustomerAddressesEditDialog/OrderCustomerAddressesEditDialog.tsx b/src/orders/components/OrderCustomerAddressesEditDialog/OrderCustomerAddressesEditDialog.tsx
index 66d63c0ab..908a85cbb 100644
--- a/src/orders/components/OrderCustomerAddressesEditDialog/OrderCustomerAddressesEditDialog.tsx
+++ b/src/orders/components/OrderCustomerAddressesEditDialog/OrderCustomerAddressesEditDialog.tsx
@@ -140,7 +140,7 @@ const OrderCustomerAddressesEditDialog: React.FC<OrderCustomerAddressesEditDialo
             <DialogTitle>
               <FormattedMessage {...dialogMessages.title} />
             </DialogTitle>
-            <DialogContent className={classes.overflow}>
+            <DialogContent className={classes.scrollableContent}>
               <Typography>
                 {customerAddresses.length > 0 ? (
                   <FormattedMessage
diff --git a/src/orders/components/OrderCustomerAddressesEditDialog/styles.ts b/src/orders/components/OrderCustomerAddressesEditDialog/styles.ts
index 610a5ed5d..bcf0775a1 100644
--- a/src/orders/components/OrderCustomerAddressesEditDialog/styles.ts
+++ b/src/orders/components/OrderCustomerAddressesEditDialog/styles.ts
@@ -2,6 +2,14 @@ import { makeStyles } from "@saleor/macaw-ui";
 
 export const useStyles = makeStyles(
   {
+    scrollableContent: {
+      maxHeight: `calc(100vh - 250px)`,
+      overflow: "scroll"
+    },
+    scrollableWrapper: {
+      maxHeight: 400,
+      overflow: "scroll"
+    },
     container: {
       display: "block"
     },