diff --git a/packages/builder/src/BackendRoot.svelte b/packages/builder/src/BackendRoot.svelte
index a4f0885a88..26cd39f756 100644
--- a/packages/builder/src/BackendRoot.svelte
+++ b/packages/builder/src/BackendRoot.svelte
@@ -15,7 +15,7 @@
   <div class="nav">
     <BackendNav />
   </div>
-  <div class="content" style="width: calc(100% - {navWidth}); left: {navWidth}">
+  <div class="content">
     {#if $store.activeNav === 'database'}
       <Database />
     {:else if $store.activeNav === 'actions'}
@@ -37,9 +37,12 @@
     height: 100%;
     background-color: var(--white);
     margin: 0;
+    overflow-y: auto;
+    overflow-x: hidden;
   }
 
   .nav {
+    overflow: auto;
     flex: 0 1 auto;
     width: 300px;
     height: 100%;
diff --git a/packages/builder/src/PackageRoot.svelte b/packages/builder/src/PackageRoot.svelte
index fa70d0718c..6652c74a1f 100644
--- a/packages/builder/src/PackageRoot.svelte
+++ b/packages/builder/src/PackageRoot.svelte
@@ -60,12 +60,14 @@
     display: flex;
     align-items: center;
     border-bottom: 1px solid #ddd;
+    box-sizing: border-box;
   }
 
   .content {
     flex: 1 1 auto;
     width: 100%;
     height: 100px;
+    overflow: hidden;
   }
 
   .content > div {