diff --git a/packages/builder/src/components/common/NavItem.svelte b/packages/builder/src/components/common/NavItem.svelte
index d2074b69b1..c653f4739a 100644
--- a/packages/builder/src/components/common/NavItem.svelte
+++ b/packages/builder/src/components/common/NavItem.svelte
@@ -15,6 +15,7 @@
   export let iconColor
 
   const dispatch = createEventDispatcher()
+  let textRef
 
   function onIconClick(event) {
     event.stopPropagation()
@@ -26,49 +27,58 @@
   class="nav-item"
   class:border
   class:selected
-  style={`padding-left: ${indentLevel * 14}px`}
+  style={`padding-left: ${20 + indentLevel * 14}px`}
   {draggable}
   on:dragend
   on:dragstart
   on:dragover
   on:drop
   on:click
+  on:mouseover={() => {
+    const size = textRef.getBoundingClientRect()
+    dispatch("mouseover", size.width)
+  }}
   ondragover="return false"
   ondragenter="return false"
 >
-  <div class="content">
-    {#if withArrow}
-      <div class:opened class="icon arrow" on:click={onIconClick}>
-        <Icon size="S" name="ChevronRight" />
-      </div>
-    {/if}
+  {#if withArrow}
+    <div class:opened class="icon arrow" on:click={onIconClick}>
+      <Icon size="S" name="ChevronRight" />
+    </div>
+  {/if}
 
-    <slot name="icon" />
-    {#if iconText}
-      <div class="iconText" style={iconColor ? `color: ${iconColor};` : ""}>
-        {iconText}
-      </div>
-    {:else if icon}
-      <div class="icon">
-        <Icon color={iconColor} size="S" name={icon} />
-      </div>
-    {/if}
-    <div class="text">{text}</div>
-    {#if withActions}
-      <div class="actions">
-        <slot />
-      </div>
-    {/if}
-  </div>
+  <slot name="icon" />
+  {#if iconText}
+    <div class="iconText" style={iconColor ? `color: ${iconColor};` : ""}>
+      {iconText}
+    </div>
+  {:else if icon}
+    <div class="icon">
+      <Icon color={iconColor} size="S" name={icon} />
+    </div>
+  {/if}
+  <div class="text" bind:this={textRef}>{text}</div>
+  {#if withActions}
+    <div class="actions">
+      <slot />
+    </div>
+  {/if}
 </div>
 
 <style>
   .nav-item {
-    border-radius: var(--border-radius-s);
     cursor: pointer;
     color: var(--grey-7);
     transition: background-color
       var(--spectrum-global-animation-duration-100, 130ms) ease-in-out;
+    padding: 0 var(--spacing-m) 0 var(--spacing-xl);
+    height: 32px;
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-start;
+    align-items: center;
+    gap: var(--spacing-xs);
+    width: calc(max-content - 64px);
   }
   .nav-item.selected {
     background-color: var(--grey-2);
@@ -81,16 +91,6 @@
     visibility: visible;
   }
 
-  .content {
-    padding: 0 var(--spacing-s);
-    height: 32px;
-    display: flex;
-    flex-direction: row;
-    justify-content: flex-start;
-    align-items: center;
-    gap: var(--spacing-xs);
-  }
-
   .icon {
     font-size: 16px;
     flex: 0 0 20px;
@@ -111,12 +111,12 @@
   }
 
   .text {
-    flex: 1 1 auto;
     font-weight: 600;
     font-size: var(--spectrum-global-dimension-font-size-75);
+    white-space: nowrap;
+    max-width: 180px;
     overflow: hidden;
     text-overflow: ellipsis;
-    white-space: nowrap;
   }
 
   .actions {
@@ -128,6 +128,7 @@
     flex-direction: row;
     justify-content: center;
     align-items: center;
+    margin-left: var(--spacing-s);
   }
 
   .iconText {
diff --git a/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/ComponentTree.svelte b/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/ComponentTree.svelte
index c5dfd63cf9..67e403a705 100644
--- a/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/ComponentTree.svelte
+++ b/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/ComponentTree.svelte
@@ -1,4 +1,5 @@
 <script>
+  import { getContext } from "svelte"
   import { store } from "builderStore"
   import { DropEffect, DropPosition } from "./dragDropStore"
   import ComponentDropdownMenu from "../ComponentDropdownMenu.svelte"
@@ -12,6 +13,8 @@
   export let level = 0
   export let dragDropStore
 
+  const scrollApi = getContext("scroll")
+
   let closedNodes = {}
 
   const selectComponent = component => {
@@ -93,6 +96,9 @@
         on:dragover={dragover(component, index)}
         on:iconClick={() => toggleNodeOpen(component._id)}
         on:drop={onDrop}
+        on:mouseover={e => {
+          scrollApi.scrollTo(level + 1, e.detail)
+        }}
         text={getComponentText(component)}
         withArrow
         indentLevel={level + 1}
@@ -133,6 +139,10 @@
     padding-left: 0;
     margin: 0;
   }
+  ul,
+  li {
+    min-width: max-content;
+  }
 
   .drop-item {
     border-radius: var(--border-radius-m);
diff --git a/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/PathTree.svelte b/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/PathTree.svelte
index 841d8970f4..6467dc7cba 100644
--- a/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/PathTree.svelte
+++ b/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/PathTree.svelte
@@ -1,4 +1,5 @@
 <script>
+  import { getContext } from "svelte"
   import {
     store,
     selectedComponent,
@@ -21,6 +22,7 @@
   }
 
   const dragDropStore = instantiateStore()
+  const scrollApi = getContext("scroll")
 
   export let route
   export let path
@@ -73,6 +75,9 @@
     opened={routeOpened}
     {border}
     withArrow={route.subpaths}
+    on:mouseover={e => {
+      scrollApi.scrollTo(0, e.detail)
+    }}
   />
 
   {#if routeOpened}
@@ -85,6 +90,9 @@
         text={ROUTE_NAME_MAP[screen.route]?.[screen.role] || screen.route}
         withArrow={route.subpaths}
         on:click={() => changeScreen(screen.id)}
+        on:mouseover={e => {
+          scrollApi.scrollTo(1, e.detail)
+        }}
       >
         <ScreenDropdownMenu screenId={screen.id} />
       </NavItem>
diff --git a/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/index.svelte b/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/index.svelte
index 65425a5b9f..187a8da98e 100644
--- a/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/index.svelte
+++ b/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/index.svelte
@@ -68,9 +68,12 @@
 </div>
 
 <style>
+  .root {
+    min-width: max-content;
+  }
   div.empty {
-    font-size: var(--font-size-xs);
+    font-size: var(--font-size-s);
     color: var(--grey-5);
-    padding-top: var(--spacing-xs);
+    padding: var(--spacing-xs) var(--spacing-xl);
   }
 </style>
diff --git a/packages/builder/src/components/design/NavigationPanel/FrontendNavigatePane.svelte b/packages/builder/src/components/design/NavigationPanel/FrontendNavigatePane.svelte
index a5045d8e9f..12282323ee 100644
--- a/packages/builder/src/components/design/NavigationPanel/FrontendNavigatePane.svelte
+++ b/packages/builder/src/components/design/NavigationPanel/FrontendNavigatePane.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { onMount } from "svelte"
+  import { onMount, setContext } from "svelte"
   import { goto, params } from "@roxi/routify"
   import {
     store,
@@ -18,11 +18,46 @@
     Search,
     Tabs,
     Tab,
+    Layout as BBUILayout,
     notifications,
   } from "@budibase/bbui"
 
   export let showModal
 
+  let scrollRef
+
+  const scrollTo = (indent, width) => {
+    if (!indent) {
+      return
+    }
+
+    // Padding left + icon
+    const end = indent * 14 + 20 + 16 + 4 + width + 40
+    let scrollLeft = 0
+
+    if (end > 259) {
+      scrollLeft = end - 259
+    }
+
+    if (scrollLeft === scrollRef.scrollLeft) {
+      return
+    }
+
+    scrollRef.scroll({
+      left: scrollLeft,
+      behavior: "smooth",
+    })
+
+    // if (indentLevel === 0) {
+    // } else {
+    //   scrollRef.scrollLeft = 4 + indentLevel * 14
+    // }
+  }
+
+  setContext("scroll", {
+    scrollTo,
+  })
+
   const tabs = [
     {
       title: "Screens",
@@ -79,7 +114,7 @@
   <Tabs {selected} on:select={navigate}>
     <Tab title="Screens">
       <div class="tab-content-padding">
-        <div class="role-select">
+        <BBUILayout noPadding gap="XS">
           <Select
             on:change={updateAccessRole}
             value={$selectedAccessRole}
@@ -93,8 +128,8 @@
             label="Search Screens"
             bind:value={$screenSearchString}
           />
-        </div>
-        <div class="nav-items-container">
+        </BBUILayout>
+        <div class="nav-items-container" bind:this={scrollRef}>
           <ComponentNavigationTree />
         </div>
       </div>
@@ -126,23 +161,36 @@
     justify-content: flex-start;
     align-items: stretch;
     position: relative;
+    flex: 1 1 auto;
   }
+  .title :global(.spectrum-Tabs-content),
+  .title :global(.spectrum-Tabs-content > div),
+  .title :global(.spectrum-Tabs-content > div > div) {
+    height: 100%;
+  }
+
   .add-button {
     position: absolute;
     top: var(--spacing-l);
     right: var(--spacing-xl);
   }
 
-  .role-select {
+  .tab-content-padding {
+    padding: 0 var(--spacing-xl);
+    height: 100%;
     display: flex;
     flex-direction: column;
     justify-content: flex-start;
     align-items: stretch;
-    margin-bottom: var(--spacing-m);
-    gap: var(--spacing-m);
+    gap: var(--spacing-xl);
   }
 
-  .tab-content-padding {
-    padding: 0 var(--spacing-xl);
+  .nav-items-container {
+    border-top: var(--border-light);
+    margin: 0 calc(-1 * var(--spacing-xl));
+    padding: var(--spacing-m) 0;
+    flex: 1 1 auto;
+    overflow: auto;
+    height: 0;
   }
 </style>
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[assetType]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/design/[assetType]/_layout.svelte
index dc565e5f39..7e6bd75911 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[assetType]/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[assetType]/_layout.svelte
@@ -244,8 +244,6 @@
     display: flex;
     flex-direction: column;
     gap: var(--spacing-l);
-    padding: 0 0 60px 0;
-    overflow-y: auto;
     border-right: var(--border-light);
   }