diff --git a/packages/builder/src/components/nav/DatabasesList.svelte b/packages/builder/src/components/nav/DatabasesList.svelte
index 7f16e99122..b24a0c2d9a 100644
--- a/packages/builder/src/components/nav/DatabasesList.svelte
+++ b/packages/builder/src/components/nav/DatabasesList.svelte
@@ -24,13 +24,6 @@
       return state
     })
   }
-
-  onMount(() => {
-    if ($store.appInstances.length > 0) {
-      selectDatabase($store.appInstances[0])
-      $goto(`./database/${$backendUiStore.selectedDatabase.id}`)
-    }
-  })
 </script>
 
 <div class="root">
diff --git a/packages/builder/src/pages/[application]/backend/database/[selectedDatabase]/index.svelte b/packages/builder/src/pages/[application]/backend/database/[selectedDatabase]/index.svelte
index da59e18a84..dffd2932e1 100644
--- a/packages/builder/src/pages/[application]/backend/database/[selectedDatabase]/index.svelte
+++ b/packages/builder/src/pages/[application]/backend/database/[selectedDatabase]/index.svelte
@@ -44,7 +44,7 @@
 </div>
 {#if $backendUiStore.selectedDatabase.id}
   <ModelDataTable {selectRecord} />
-{:else}Please select a database{/if}
+{/if}
 
 <style>
   .database-actions {
diff --git a/packages/builder/src/pages/[application]/backend/database/index.svelte b/packages/builder/src/pages/[application]/backend/database/index.svelte
index 46977a97c3..359c33171e 100644
--- a/packages/builder/src/pages/[application]/backend/database/index.svelte
+++ b/packages/builder/src/pages/[application]/backend/database/index.svelte
@@ -1 +1,23 @@
+<script>
+  import { store, backendUiStore } from "builderStore"
+  import { goto } from "@sveltech/routify"
+  import { onMount } from "svelte"
+
+  $: instances = $store.appInstances
+  $: views = $store.hierarchy.indexes
+
+  async function selectDatabase(database) {
+    backendUiStore.actions.records.select(null)
+    backendUiStore.actions.views.select(views[0])
+    backendUiStore.actions.database.select(database)
+  }
+
+  onMount(async () => {
+    if ($store.appInstances.length > 0) {
+      await selectDatabase($store.appInstances[0])
+      $goto(`../${$backendUiStore.selectedDatabase.id}`)
+    }
+  })
+</script>
+
 Please select a database