diff --git a/src/routes/console/project-[project]/databases/database/[database]/__layout.svelte b/src/routes/console/project-[project]/databases/database/[database]/__layout.svelte
index 4f5097ead..21f5a5228 100644
--- a/src/routes/console/project-[project]/databases/database/[database]/__layout.svelte
+++ b/src/routes/console/project-[project]/databases/database/[database]/__layout.svelte
@@ -55,6 +55,6 @@
     <title>Appwrite - Database</title>
 </svelte:head>
 
-{#if $database}
+{#if $database && $database.$id === databaseId}
     <slot />
 {/if}
diff --git a/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/__layout.svelte b/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/__layout.svelte
index 30f631cd9..f0bb7c0f2 100644
--- a/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/__layout.svelte
+++ b/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/__layout.svelte
@@ -24,7 +24,7 @@
         updateLayout({
             navigate: event,
             title: $collection.name,
-            back: `${base}/console/project-${$page.params.project}/database`,
+            back: `${base}/console/project-${$page.params.project}/databases/database/${databaseId}`,
             copy: {
                 text: 'Collection ID',
                 value: collectionId