diff --git a/packages/builder/src/pages/builder/app/[application]/data/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/index.svelte
index d3b5cff4f2..2d1d94d267 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/index.svelte
@@ -1,13 +1,25 @@
 <script>
+  import { goto } from "@roxi/routify"
+  import { onMount } from "svelte"
   import CreateDatasourceModal from "components/backend/DatasourceNavigator/modals/CreateDatasourceModal.svelte"
   import { datasources } from "stores/backend"
 
+  let modal
   $: setupComplete =
     $datasources.list.find(x => (x._id = "bb_internal")).entities.length > 1 ||
-    $datasources.list > 1
+    $datasources.list.length >= 1
+  $: console.log($datasources.list.length >= 1)
+  $: console.log(
+    $datasources.list.find(x => (x._id = "bb_internal")).entities.length > 1
+  )
+  onMount(() => {
+    if (!setupComplete) {
+      modal.show()
+    } else {
+      $goto("./table")
+    }
+  })
 </script>
 
-{#if !setupComplete}
-  <CreateDatasourceModal />
-{/if}
+<CreateDatasourceModal bind:modal />
 <!-- routify:options index=false -->