diff --git a/packages/builder/src/pages/[application]/data/_layout.svelte b/packages/builder/src/pages/[application]/data/_layout.svelte
index 3414c1fca7..2bd50edee8 100644
--- a/packages/builder/src/pages/[application]/data/_layout.svelte
+++ b/packages/builder/src/pages/[application]/data/_layout.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { params } from "@sveltech/routify"
+  import { params, isActive } from "@sveltech/routify"
   import { Switcher, Modal } from "@budibase/bbui"
   import TableNavigator from "components/backend/TableNavigator/TableNavigator.svelte"
   import DatasourceNavigator from "components/backend/DatasourceNavigator/DatasourceNavigator.svelte"
@@ -17,7 +17,7 @@
     },
   ]
 
-  let tab = $params.selectedDatasource ? "datasource" : "table"
+  let tab = $isActive('./datasource') || $params.selectedDatasource ? "datasource" : "table"
 
   let modal
 </script>
diff --git a/packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/[query]/_layout.svelte b/packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/[query]/_layout.svelte
new file mode 100644
index 0000000000..8b66cef860
--- /dev/null
+++ b/packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/[query]/_layout.svelte
@@ -0,0 +1,15 @@
+<script>
+  // import { params } from "@sveltech/routify"
+  // import { backendUiStore } from "builderStore"
+
+  // if ($params.selectedDatasource) {
+  //   const datasource = $backendUiStore.datasources.find(
+  //     m => m._id === $params.selectedDatasource
+  //   )
+  //   if (datasource) {
+  //     backendUiStore.actions.datasources.select(datasource._id)
+  //   }
+  // }
+</script>
+
+<slot />