diff --git a/frontend/src/lib/components/Breadcrumbs/Breadcrumbs.svelte b/frontend/src/lib/components/Breadcrumbs/Breadcrumbs.svelte
index 5675c0fb23..3f18044eb9 100644
--- a/frontend/src/lib/components/Breadcrumbs/Breadcrumbs.svelte
+++ b/frontend/src/lib/components/Breadcrumbs/Breadcrumbs.svelte
@@ -3,6 +3,7 @@
 	import { page } from '$app/stores';
 	import { breadcrumbs, type Breadcrumb } from '$lib/utils/breadcrumbs';
 	import { safeTranslate } from '$lib/utils/i18n';
+	import { pageTitle } from '$lib/utils/stores';
 
 	async function trimBreadcrumbsToCurrentPath(
 		breadcrumbs: Breadcrumb[],
@@ -15,9 +16,23 @@
 		return breadcrumbs;
 	}
 
+	function getPageTitle(): string {
+		return safeTranslate(
+			$page.data.title || $page.data.str || $page.data.name || $breadcrumbs.length > 1
+				? $breadcrumbs[$breadcrumbs.length - 1]?.label
+				: $page.url.pathname.split('/').pop()
+		);
+	}
+
 	afterNavigate(async () => {
 		$breadcrumbs = await trimBreadcrumbsToCurrentPath($breadcrumbs, $page.url.pathname);
 	});
+
+	$: {
+		$pageTitle = getPageTitle();
+		if ($breadcrumbs.length < 2)
+			breadcrumbs.push([{ label: $pageTitle, href: $page.url.pathname }]);
+	}
 </script>
 
 <ol class="breadcrumb-nonresponsive h-6 overflow-hidden whitespace-nowrap">
diff --git a/frontend/src/routes/(app)/+layout.svelte b/frontend/src/routes/(app)/+layout.svelte
index df55226356..9402935191 100644
--- a/frontend/src/routes/(app)/+layout.svelte
+++ b/frontend/src/routes/(app)/+layout.svelte
@@ -17,22 +17,8 @@
 	import commandPaletteOpen from '$lib/components/CommandPalette/CommandPalette.svelte';
 	let sidebarOpen = true;
 
-	function getPageTitle(): string {
-		return safeTranslate(
-			$page.data.title || $page.data.str || $page.data.name || $breadcrumbs.length > 1
-				? $breadcrumbs[$breadcrumbs.length - 1]?.label
-				: $page.url.pathname.split('/').pop()
-		);
-	}
-
 	$: classesSidebarOpen = (open: boolean) => (open ? 'ml-7 lg:ml-64' : 'ml-7');
 
-	$: {
-		$pageTitle = getPageTitle();
-		if ($breadcrumbs.length < 2)
-			breadcrumbs.push([{ label: $pageTitle, href: $page.url.pathname }]);
-	}
-
 	$: if (browser) {
 		const fromLogin = getCookie('from_login');
 		if (fromLogin === 'true') {