diff --git a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte
index 5f914f545a..86cea3b3b9 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte
@@ -206,7 +206,7 @@
       </NavItem>
 
       {#if datasource.open}
-        <TableNavigator sourceId={datasource._id} {selectTable} />
+        <TableNavigator sourceId={datasource._id} {selectTable} {searchTerm} />
         {#each $queries.list.filter(query => query.datasourceId === datasource._id && (!searchTerm || query.name
                 ?.toLowerCase()
                 ?.indexOf(searchTerm.toLowerCase()) > -1)) as query}
diff --git a/packages/builder/src/components/backend/TableNavigator/TableNavigator.svelte b/packages/builder/src/components/backend/TableNavigator/TableNavigator.svelte
index 712d74889c..3f0538ceb3 100644
--- a/packages/builder/src/components/backend/TableNavigator/TableNavigator.svelte
+++ b/packages/builder/src/components/backend/TableNavigator/TableNavigator.svelte
@@ -7,6 +7,7 @@
   import { goto, isActive } from "@roxi/routify"
   import { userSelectedResourceMap } from "builderStore"
 
+  export let searchTerm
   export let sourceId
   export let selectTable
 
@@ -14,6 +15,11 @@
     .filter(
       table => table.sourceId === sourceId && table._id !== TableNames.USERS
     )
+    .filter(
+      table =>
+        !searchTerm ||
+        table.name.toLowerCase()?.indexOf(searchTerm.toLowerCase()) > -1
+    )
     .sort(alphabetical)
 
   const alphabetical = (a, b) => {
diff --git a/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte
index 90f9fb6be2..3fbf18eac5 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { Button, Layout } from "@budibase/bbui"
+  import { Layout } from "@budibase/bbui"
   import DatasourceNavigator from "components/backend/DatasourceNavigator/DatasourceNavigator.svelte"
   import Panel from "components/design/Panel.svelte"
   import { isActive, redirect, goto, params } from "@roxi/routify"