diff --git a/packages/builder/src/components/common/Switcher.svelte b/packages/builder/src/components/common/Switcher.svelte
index 7987239a08..35c564a5e3 100644
--- a/packages/builder/src/components/common/Switcher.svelte
+++ b/packages/builder/src/components/common/Switcher.svelte
@@ -44,11 +44,13 @@
     flex-direction: column;
     padding: 20px 20px;
     border-left: solid 1px var(--grey);
+    box-sizing: border-box;
   }
 
   .switcher {
     display: flex;
     margin: 0px 20px 20px 0px;
+    box-sizing: border-box;
   }
 
   .switcher > button {
@@ -67,4 +69,9 @@
   .switcher > .selected {
     color: var(--ink);
   }
+  
+  .panel {
+    min-height: 0;
+    overflow-y: auto;
+  }
 </style>