diff --git a/libs/shared/filter/src/lib/inputs/checkbox-input/checkbox-input-control.component.scss b/libs/shared/filter/src/lib/inputs/checkbox-input/checkbox-input-control.component.scss
index f92692e2a..1ce24d44e 100644
--- a/libs/shared/filter/src/lib/inputs/checkbox-input/checkbox-input-control.component.scss
+++ b/libs/shared/filter/src/lib/inputs/checkbox-input/checkbox-input-control.component.scss
@@ -1,3 +1,3 @@
 :host {
-  @apply block flex-grow  w-full;
+  @apply block flex-grow w-full;
 }
diff --git a/libs/shared/filter/src/lib/inputs/checkbox-input/checkbox-input.component.scss b/libs/shared/filter/src/lib/inputs/checkbox-input/checkbox-input.component.scss
index 8abd459ba..3749a7c0e 100644
--- a/libs/shared/filter/src/lib/inputs/checkbox-input/checkbox-input.component.scss
+++ b/libs/shared/filter/src/lib/inputs/checkbox-input/checkbox-input.component.scss
@@ -1,3 +1,3 @@
 .filter-checkbox-input {
-  @apply inline-block w-full p-6 text-isa-neutral-900 overflow-scroll max-h-96;
+  @apply inline-block w-full p-6 text-isa-neutral-900;
 }
diff --git a/libs/shared/filter/src/lib/inputs/input-renderer/input-renderer.component.scss b/libs/shared/filter/src/lib/inputs/input-renderer/input-renderer.component.scss
index e69de29bb..064554699 100644
--- a/libs/shared/filter/src/lib/inputs/input-renderer/input-renderer.component.scss
+++ b/libs/shared/filter/src/lib/inputs/input-renderer/input-renderer.component.scss
@@ -0,0 +1,7 @@
+.filter-input-renderer {
+  @apply overflow-hidden overflow-y-scroll max-h-96;
+
+  &:has(filter-datepicker-range-input) {
+    @apply max-h-[31rem];
+  }
+}
diff --git a/libs/ui/datepicker/src/lib/_month-year-body.scss b/libs/ui/datepicker/src/lib/_month-year-body.scss
index 74fedba24..65e3209eb 100644
--- a/libs/ui/datepicker/src/lib/_month-year-body.scss
+++ b/libs/ui/datepicker/src/lib/_month-year-body.scss
@@ -3,7 +3,7 @@
 }
 
 .ui-month-year-body__list {
-  @apply min-h-80 max-h-80 flex flex-col overflow-hidden overflow-y-scroll px-1;
+  @apply flex flex-col px-1;
 }
 
 .ui-month-year-body__list-element {