diff --git a/packages/grafana-ui/src/components/Modal/getModalStyles.ts b/packages/grafana-ui/src/components/Modal/getModalStyles.ts
index 60b181d5d80..de07b44210d 100644
--- a/packages/grafana-ui/src/components/Modal/getModalStyles.ts
+++ b/packages/grafana-ui/src/components/Modal/getModalStyles.ts
@@ -22,6 +22,9 @@ export const getModalStyles = stylesFactory((theme: GrafanaTheme2) => {
       margin-left: auto;
       margin-right: auto;
       top: 10%;
+      max-height: 80%;
+      display: flex;
+      flex-direction: column;
     `,
     modalBackdrop: css`
       position: fixed;
@@ -66,6 +69,7 @@ export const getModalStyles = stylesFactory((theme: GrafanaTheme2) => {
       justify-content: flex-end;
     `,
     modalContent: css`
+      overflow: auto;
       padding: ${theme.spacing(3)};
       width: 100%;
     `,