diff --git a/packages/builder/src/components/userInterface/ComponentPropertiesPanel.svelte b/packages/builder/src/components/userInterface/ComponentPropertiesPanel.svelte
index 726fb35aae..fb4f01578c 100644
--- a/packages/builder/src/components/userInterface/ComponentPropertiesPanel.svelte
+++ b/packages/builder/src/components/userInterface/ComponentPropertiesPanel.svelte
@@ -104,7 +104,6 @@
     height: 100%;
     display: flex;
     flex-direction: column;
-    overflow-x: hidden;
   }
 
   .title > div:nth-child(1) {
diff --git a/packages/builder/src/components/userInterface/ComponentsPaneSwitcher.svelte b/packages/builder/src/components/userInterface/ComponentsPaneSwitcher.svelte
index ecc7dd1d6d..9df2a928ca 100644
--- a/packages/builder/src/components/userInterface/ComponentsPaneSwitcher.svelte
+++ b/packages/builder/src/components/userInterface/ComponentsPaneSwitcher.svelte
@@ -54,7 +54,7 @@
     height: 100%;
     display: flex;
     flex-direction: column;
-    padding: 20px 20px;
+    padding: 20px 5px 20px 10px;
     border-left: solid 1px var(--grey);
   }
 
diff --git a/packages/builder/src/components/userInterface/DesignView.svelte b/packages/builder/src/components/userInterface/DesignView.svelte
index 9e005ee3bb..f13f62663e 100644
--- a/packages/builder/src/components/userInterface/DesignView.svelte
+++ b/packages/builder/src/components/userInterface/DesignView.svelte
@@ -64,6 +64,9 @@
 
   .design-view-property-groups {
     flex: 1;
+    overflow-y: auto;
+    overflow-x: hidden;
+    max-height: 500px;
   }
 
   .no-design {
diff --git a/packages/builder/src/pages/[application]/frontend/_layout.svelte b/packages/builder/src/pages/[application]/frontend/_layout.svelte
index 572ffe42ec..7847de710c 100644
--- a/packages/builder/src/pages/[application]/frontend/_layout.svelte
+++ b/packages/builder/src/pages/[application]/frontend/_layout.svelte
@@ -143,7 +143,7 @@
   .ui-nav {
     grid-column: 1;
     background-color: var(--white);
-    height: calc(100vh - 49px);
+    height: calc(100vh - 69px);
     padding: 0;
     overflow: scroll;
     display: flex;
@@ -161,6 +161,8 @@
     grid-column: 3;
     background-color: var(--white);
     min-height: 0px;
+    height: calc(100vh - 69px);
+    overflow-y: hidden;
   }
 
   .components-nav-page {