diff --git a/src/common/ModalDialog/ModalDialog.js b/src/common/ModalDialog/ModalDialog.js
index 52d0a2513..1efa6ea6e 100644
--- a/src/common/ModalDialog/ModalDialog.js
+++ b/src/common/ModalDialog/ModalDialog.js
@@ -70,7 +70,7 @@ const ModalDialog = ({ className, title, buttons, children, dataset, onCloseRequ
                             :
                             null
                     }
-                    <div className={styles['modal-dialog-content']}>
+                    <div className={styles['body-container']}>
                         {children}
                     </div>
                     {
diff --git a/src/common/ModalDialog/styles.less b/src/common/ModalDialog/styles.less
index 9aafca16a..bde17932d 100644
--- a/src/common/ModalDialog/styles.less
+++ b/src/common/ModalDialog/styles.less
@@ -67,6 +67,7 @@
         .modal-dialog-content {
             z-index: 1;
             position: relative;
+            overflow-y: auto;
 
             .title-container {
                 flex: 1 0 auto;
@@ -78,7 +79,7 @@
                 color: var(--primary-foreground-color);
             }
 
-            .modal-dialog-content {
+            .body-container {
                 flex: 1;
                 align-self: stretch;
                 overflow-y: auto;
@@ -157,9 +158,11 @@
             z-index: 0;
             padding: 0 1.5rem;
 
-            .buttons-container {
-                flex-direction: column;
-                gap: 1rem;
+            .modal-dialog-content {
+                .buttons-container {
+                    flex-direction: column;
+                    gap: 1rem;
+                }
             }
         }