diff --git a/src/components/input/FilterEditForm.tsx b/src/components/input/FilterEditForm.tsx
index 02258b5be..852427d68 100644
--- a/src/components/input/FilterEditForm.tsx
+++ b/src/components/input/FilterEditForm.tsx
@@ -78,16 +78,7 @@ export function FilterEditForm({ websiteId, onChange, onClose }: FilterEditFormP
   const panelStyle = { overflowY: 'auto' as const, minHeight: 0 };
 
   return (
-    <Column
-      width={isMobile ? 'auto' : '800px'}
-      gap="6"
-      minHeight="500px"
-      style={{
-        maxHeight: isMobile
-          ? 'calc(100dvh - 64px)'
-          : 'calc(min(80dvh, 100dvh - 40px) - 64px)',
-      }}
-    >
+    <Column width={isMobile ? 'auto' : '800px'} gap="6" style={{ flex: 1, minHeight: 0 }}>
       <Tabs
         style={{
           flex: 1,
diff --git a/src/components/input/WebsiteFilterButton.tsx b/src/components/input/WebsiteFilterButton.tsx
index 95bb0ba2f..47fe07834 100644
--- a/src/components/input/WebsiteFilterButton.tsx
+++ b/src/components/input/WebsiteFilterButton.tsx
@@ -39,7 +39,12 @@ export function WebsiteFilterButton({
   };
 
   return (
-    <DialogButton icon={<ListFilter />} label={t(labels.filter)} variant="outline">
+    <DialogButton
+      icon={<ListFilter />}
+      label={t(labels.filter)}
+      variant="outline"
+      height="min(80dvh, calc(100dvh - 40px))"
+    >
       {({ close }) => {
         return (
           <>