diff --git a/src/app/(main)/websites/[websiteId]/cohorts/CohortAddButton.tsx b/src/app/(main)/websites/[websiteId]/cohorts/CohortAddButton.tsx
index 3f155f64..aa62f1d9 100644
--- a/src/app/(main)/websites/[websiteId]/cohorts/CohortAddButton.tsx
+++ b/src/app/(main)/websites/[websiteId]/cohorts/CohortAddButton.tsx
@@ -15,7 +15,10 @@ export function CohortAddButton({ websiteId }: { websiteId: string }) {
         <Text>{formatMessage(labels.cohort)}</Text>
       </Button>
       <Modal>
-        <Dialog title={formatMessage(labels.cohort)} style={{ width: 800, minHeight: 300 }}>
+        <Dialog
+          title={formatMessage(labels.cohort)}
+          style={{ width: 800, minHeight: 300, maxHeight: '90vh' }}
+        >
           {({ close }) => {
             return <CohortEditForm websiteId={websiteId} onClose={close} />;
           }}
diff --git a/src/app/(main)/websites/[websiteId]/cohorts/CohortEditButton.tsx b/src/app/(main)/websites/[websiteId]/cohorts/CohortEditButton.tsx
index d7f80a70..86b3dedc 100644
--- a/src/app/(main)/websites/[websiteId]/cohorts/CohortEditButton.tsx
+++ b/src/app/(main)/websites/[websiteId]/cohorts/CohortEditButton.tsx
@@ -18,7 +18,10 @@ export function CohortEditButton({
 
   return (
     <ActionButton title={formatMessage(labels.edit)} icon={<Edit />}>
-      <Dialog title={formatMessage(labels.cohort)} style={{ width: 800, minHeight: 300 }}>
+      <Dialog
+        title={formatMessage(labels.cohort)}
+        style={{ width: 800, minHeight: 300, maxHeight: '90vh' }}
+      >
         {({ close }) => {
           return (
             <CohortEditForm
diff --git a/src/app/(main)/websites/[websiteId]/segments/SegmentAddButton.tsx b/src/app/(main)/websites/[websiteId]/segments/SegmentAddButton.tsx
index d27acb3c..ef207948 100644
--- a/src/app/(main)/websites/[websiteId]/segments/SegmentAddButton.tsx
+++ b/src/app/(main)/websites/[websiteId]/segments/SegmentAddButton.tsx
@@ -15,7 +15,10 @@ export function SegmentAddButton({ websiteId }: { websiteId: string }) {
         <Text>{formatMessage(labels.segment)}</Text>
       </Button>
       <Modal>
-        <Dialog title={formatMessage(labels.segment)} style={{ width: 800, minHeight: 300 }}>
+        <Dialog
+          title={formatMessage(labels.segment)}
+          style={{ width: 800, minHeight: 300, maxHeight: '90vh' }}
+        >
           {({ close }) => {
             return <SegmentEditForm websiteId={websiteId} onClose={close} />;
           }}
diff --git a/src/app/(main)/websites/[websiteId]/segments/SegmentEditButton.tsx b/src/app/(main)/websites/[websiteId]/segments/SegmentEditButton.tsx
index 3995e344..43763398 100644
--- a/src/app/(main)/websites/[websiteId]/segments/SegmentEditButton.tsx
+++ b/src/app/(main)/websites/[websiteId]/segments/SegmentEditButton.tsx
@@ -18,7 +18,10 @@ export function SegmentEditButton({
 
   return (
     <ActionButton title={formatMessage(labels.edit)} icon={<Edit />}>
-      <Dialog title={formatMessage(labels.segment)} style={{ width: 800, minHeight: 300 }}>
+      <Dialog
+        title={formatMessage(labels.segment)}
+        style={{ width: 800, minHeight: 300, maxHeight: '90vh' }}
+      >
         {({ close }) => {
           return (
             <SegmentEditForm