diff --git a/.changeset/email-blocks-popover-height.md b/.changeset/email-blocks-popover-height.md
new file mode 100644
index 00000000..ae0dce0d
--- /dev/null
+++ b/.changeset/email-blocks-popover-height.md
@@ -0,0 +1,5 @@
+---
+"@sendlit/email-blocks": patch
+---
+
+The contact filter builder's segment and filter popovers now stay on screen. They are capped to the space left in the viewport and scroll, so a long list of filters no longer runs off the edge.
diff --git a/packages/email-blocks/src/contact-filter-builder.tsx b/packages/email-blocks/src/contact-filter-builder.tsx
index e19a63af..9bf05033 100644
--- a/packages/email-blocks/src/contact-filter-builder.tsx
+++ b/packages/email-blocks/src/contact-filter-builder.tsx
@@ -463,7 +463,10 @@ export function ContactFilterBuilder({
               <span className="sr-only">{segmentTriggerSrLabel}</span>
             </Button>
           </PopoverTrigger>
-          <PopoverContent align="start" className="w-80 p-2">
+          <PopoverContent
+            align="start"
+            className="w-80 p-2 max-h-[var(--radix-popover-content-available-height)] overflow-y-auto"
+          >
             <div className="px-2 py-2">
               <p className="text-sm font-semibold">{segmentsHeading}</p>
               <p className="mt-1 text-xs text-muted-foreground">
@@ -533,7 +536,10 @@ export function ContactFilterBuilder({
               {filtersButtonLabel}
             </Button>
           </PopoverTrigger>
-          <PopoverContent align="start" className="w-80">
+          <PopoverContent
+            align="start"
+            className="w-80 max-h-[var(--radix-popover-content-available-height)] overflow-y-auto"
+          >
             {!activeDefinition ? (
               <div className="space-y-1">
                 <p