diff --git a/packages/bbui/src/Menu/Item.svelte b/packages/bbui/src/Menu/Item.svelte
index 05a33adda9..758b819a62 100644
--- a/packages/bbui/src/Menu/Item.svelte
+++ b/packages/bbui/src/Menu/Item.svelte
@@ -35,7 +35,7 @@
 
 <!-- svelte-ignore a11y-click-events-have-key-events -->
 <li
-  on:click|preventDefault={disabled ? null : onClick}
+  on:click={disabled ? null : onClick}
   class="spectrum-Menu-item"
   class:is-disabled={disabled}
   role="menuitem"
diff --git a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/_components/CreateViewModal.svelte b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/_components/CreateViewModal.svelte
index 77477054b8..a37b5ccf82 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/_components/CreateViewModal.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/_components/CreateViewModal.svelte
@@ -9,7 +9,9 @@
   let modal
 
   $: views = Object.keys(table?.views || {}).map(x => x.toLowerCase())
-  $: nameExists = views.includes(name?.trim().toLowerCase())
+  $: trimmedName = name?.trim()
+  $: nameExists = views.includes(trimmedName?.toLowerCase())
+  $: nameValid = trimmedName?.length && !nameExists
 
   export const show = () => {
     name = null
@@ -29,15 +31,15 @@
   }
 
   const saveView = async () => {
-    name = name?.trim()
     try {
       const newView = await viewsV2.create({
-        name,
+        name: trimmedName,
         tableId: table._id,
         schema: enrichSchema(table.schema),
         primaryDisplay: table.primaryDisplay,
       })
       notifications.success(`View ${name} created`)
+      name = null
       $goto(`./${newView.id}`)
     } catch (error) {
       notifications.error("Error creating view")
@@ -50,7 +52,7 @@
     title="Create view"
     confirmText="Create view"
     onConfirm={saveView}
-    disabled={nameExists}
+    disabled={!nameValid}
   >
     <Input
       label="View name"
diff --git a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/_components/ViewNavBar.svelte b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/_components/ViewNavBar.svelte
index fb7d46f259..7cc125ae67 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/_components/ViewNavBar.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/_components/ViewNavBar.svelte
@@ -6,7 +6,7 @@
     contextMenuStore,
   } from "stores/builder"
   import IntegrationIcon from "components/backend/DatasourceNavigator/IntegrationIcon.svelte"
-  import { Icon, Button } from "@budibase/bbui"
+  import { Icon, Button, Popover, ActionMenu, MenuItem } from "@budibase/bbui"
   import { params, url } from "@roxi/routify"
   import EditViewModal from "./EditViewModal.svelte"
   import DeleteViewModal from "./DeleteViewModal.svelte"
@@ -18,6 +18,13 @@
   import { TableNames } from "constants"
   import { alphabetical } from "components/backend/TableNavigator/utils"
   import CreateViewModal from "./CreateViewModal.svelte"
+  import { onDestroy } from "svelte"
+
+  let viewContainer
+  let observer
+  let viewVisibiltyMap = {}
+  let overflowPopover
+  let anchor
 
   // Editing table
   let createViewModal
@@ -30,8 +37,8 @@
   let deleteViewModal
 
   $: tableId = $params.tableId
-  $: table = $tables.list.find(x => x._id === tableId)
-  $: datasource = $datasources.list.find(x => x._id === table?.sourceId)
+  $: table = $tables.list.find(table => table._id === tableId)
+  $: datasource = $datasources.list.find(ds => ds._id === table?.sourceId)
   $: tableSelectedBy = $userSelectedResourceMap[table?._id]
   $: tableEditable = table?._id !== TableNames.USERS
   $: activeId = $params.viewId ?? $params.tableId
@@ -39,6 +46,8 @@
     .filter(x => x.version === 2)
     .slice()
     .sort(alphabetical)
+  $: setUpObserver(viewContainer, views)
+  $: overflowedViews = views.filter(view => !viewVisibiltyMap[view.id])
 
   const openTableContextMenu = e => {
     if (!tableEditable) {
@@ -104,9 +113,39 @@
       }
     )
   }
+
+  const setUpObserver = (viewContainer, views) => {
+    if (!views.length || !viewContainer) {
+      observer?.disconnect()
+      return
+    }
+    observer = new IntersectionObserver(
+      entries => {
+        let updates = {}
+        for (let entry of entries) {
+          updates[entry.target.dataset.id] = entry.isIntersecting
+        }
+        viewVisibiltyMap = {
+          ...viewVisibiltyMap,
+          ...updates,
+        }
+      },
+      {
+        threshold: 1,
+        root: viewContainer,
+      }
+    )
+    for (let child of viewContainer.children) {
+      observer.observe(child)
+    }
+  }
+
+  onDestroy(() => {
+    observer?.disconnect()
+  })
 </script>
 
-<div class="view-nav-bar">
+<div class="nav">
   <IntegrationIcon
     integrationType={datasource.source}
     schema={datasource.schema}
@@ -114,11 +153,11 @@
   />
   <a
     href={$url(`../${tableId}`)}
-    class="nav-bar-item"
+    class="nav-item"
     class:active={tableId === activeId}
     on:contextmenu={openTableContextMenu}
   >
-    <div class="title">
+    <div class="nav-item__title">
       {table.name}
     </div>
     {#if tableSelectedBy}
@@ -134,35 +173,66 @@
       />
     {/if}
   </a>
-  {#each views as view (view.id)}
-    {@const selectedBy = $userSelectedResourceMap[view.id]}
-    <a
-      href={$url(`../${tableId}/${encodeURIComponent(view.id)}`)}
-      class="nav-bar-item"
-      class:active={view.id === activeId}
-      on:contextmenu={e => openViewContextMenu(e, view)}
-    >
-      <div class="title">
-        {view.name}
-      </div>
-      {#if selectedBy}
-        <UserAvatars size="XS" users={selectedBy} />
-      {/if}
-      <Icon
-        on:click={e => openViewContextMenu(e, view)}
-        hoverable
-        name="MoreSmallList"
-        color="var(--spectrum-global-color-gray-600)"
-        hoverColor="var(--spectrum-global-color-gray-900)"
-      />
-    </a>
-  {/each}
+  {#if views.length}
+    <div class="nav__views" bind:this={viewContainer}>
+      {#each views as view (view.id)}
+        {@const selectedBy = $userSelectedResourceMap[view.id]}
+        <a
+          href={$url(`../${tableId}/${encodeURIComponent(view.id)}`)}
+          class="nav-item"
+          class:active={view.id === activeId}
+          class:hidden={!viewVisibiltyMap[view.id]}
+          on:contextmenu={e => openViewContextMenu(e, view)}
+          data-id={view.id}
+        >
+          <div class="nav-item__title">
+            {view.name}
+          </div>
+          {#if selectedBy}
+            <UserAvatars size="XS" users={selectedBy} />
+          {/if}
+          <Icon
+            on:click={e => openViewContextMenu(e, view)}
+            hoverable
+            name="MoreSmallList"
+            color="var(--spectrum-global-color-gray-600)"
+            hoverColor="var(--spectrum-global-color-gray-900)"
+          />
+        </a>
+      {/each}
+    </div>
+  {/if}
   {#if !views.length && tableEditable}
     <Button cta on:click={createViewModal?.show}>Create a view</Button>
     <span>
       To create subsets of data, control access and more, create a view.
     </span>
   {/if}
+  {#if overflowedViews.length}
+    <ActionMenu align="right">
+      <div slot="control">
+        <Icon
+          name="ChevronDown"
+          size="XL"
+          hoverable
+          color="var(--spectrum-global-color-gray-600)"
+          hoverColor="var(--spectrum-global-color-gray-900)"
+          on:click={overflowPopover?.show}
+        />
+      </div>
+      {#each overflowedViews as view}
+        <a
+          class="nav-overflow-item"
+          class:active={view.id === activeId}
+          href={$url(`../${tableId}/${encodeURIComponent(view.id)}`)}
+        >
+          <MenuItem>
+            {view.name}
+          </MenuItem>
+        </a>
+      {/each}
+    </ActionMenu>
+  {/if}
   {#if views.length}
     <Icon
       name="Add"
@@ -187,7 +257,8 @@
 {/if}
 
 <style>
-  .view-nav-bar {
+  /* Main containers */
+  .nav {
     height: 50px;
     border-bottom: var(--border-light);
     display: flex;
@@ -195,9 +266,21 @@
     justify-content: flex-start;
     align-items: center;
     padding: 0 var(--spacing-xl);
-    gap: var(--spacing-m);
+    gap: 8px;
   }
-  .nav-bar-item {
+  .nav__views {
+    width: 0;
+    flex: 1 1 auto;
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-start;
+    align-items: center;
+    overflow: hidden;
+    gap: 8px;
+  }
+
+  /* Table and view items */
+  .nav-item {
     padding: 6px 8px;
     border-radius: 4px;
     display: flex;
@@ -208,16 +291,22 @@
     transition: background 130ms ease-out, color 130ms ease-out;
     color: var(--spectrum-global-color-gray-600);
   }
-  .title {
-    font-size: 16px;
+  .nav-item.hidden {
+    visibility: hidden;
   }
-  .nav-bar-item.active,
-  .nav-bar-item:hover {
-    color: var(--spectrum-global-color-gray-900);
+  .nav-item.active,
+  .nav-item:hover {
     background: var(--spectrum-global-color-gray-300);
     cursor: pointer;
+    color: var(--spectrum-global-color-gray-900);
   }
-  .nav-bar-item:not(.active) :global(.icon) {
+  .nav-item:not(.active) :global(.icon) {
     display: none;
   }
+  .nav-item__title {
+    max-width: 150px;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+  }
 </style>