diff --git a/web/package-lock.json b/web/package-lock.json
index 69dda6a7..fb2cb329 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -34,6 +34,7 @@
 				"@sveltejs/kit": "^2.57.1",
 				"@sveltejs/vite-plugin-svelte": "^6.2.4",
 				"@types/marked": "^5.0.2",
+				"@types/qrcode": "^1.5.6",
 				"marked": "^17.0.5",
 				"svelte": "^5.51.0",
 				"svelte-check": "^4.4.2",
@@ -1938,6 +1939,26 @@
 			"integrity": "sha512-RGdgjQUZba5p6QEFAVx2OGb8rQDL/cPRG7GiedRzMcJ1tYnUANBncjbSB1NRGwbvjcPeikRABz2nshyPk1bhWg==",
 			"license": "MIT"
 		},
+		"node_modules/@types/node": {
+			"version": "25.6.0",
+			"resolved": "https://registry.npmjs.org/@types/node/-/node-25.6.0.tgz",
+			"integrity": "sha512-+qIYRKdNYJwY3vRCZMdJbPLJAtGjQBudzZzdzwQYkEPQd+PJGixUL5QfvCLDaULoLv+RhT3LDkwEfKaAkgSmNQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"undici-types": "~7.19.0"
+			}
+		},
+		"node_modules/@types/qrcode": {
+			"version": "1.5.6",
+			"resolved": "https://registry.npmjs.org/@types/qrcode/-/qrcode-1.5.6.tgz",
+			"integrity": "sha512-te7NQcV2BOvdj2b1hCAHzAoMNuj65kNBMz0KBaxM6c3VGBOhU0dURQKOtH8CFNI/dsKkwlv32p26qYQTWoB5bw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@types/node": "*"
+			}
+		},
 		"node_modules/@types/trusted-types": {
 			"version": "2.0.7",
 			"resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz",
@@ -3957,6 +3978,13 @@
 			"integrity": "sha512-yDJTmhydvl5lJzBmy/hyOAA0d+aqCBuwl818haVdYCRrWV84o7YyeVm4QlVHStqNrrJSTb6jKuFAVqAFsr+K3Q==",
 			"license": "MIT"
 		},
+		"node_modules/undici-types": {
+			"version": "7.19.2",
+			"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.19.2.tgz",
+			"integrity": "sha512-qYVnV5OEm2AW8cJMCpdV20CDyaN3g0AjDlOGf1OW4iaDEx8MwdtChUp4zu4H0VP3nDRF/8RKWH+IPp9uW0YGZg==",
+			"dev": true,
+			"license": "MIT"
+		},
 		"node_modules/uuid": {
 			"version": "11.1.0",
 			"resolved": "https://registry.npmjs.org/uuid/-/uuid-11.1.0.tgz",
diff --git a/web/package.json b/web/package.json
index 220335a8..ef753222 100644
--- a/web/package.json
+++ b/web/package.json
@@ -18,6 +18,7 @@
 		"@sveltejs/kit": "^2.57.1",
 		"@sveltejs/vite-plugin-svelte": "^6.2.4",
 		"@types/marked": "^5.0.2",
+		"@types/qrcode": "^1.5.6",
 		"marked": "^17.0.5",
 		"svelte": "^5.51.0",
 		"svelte-check": "^4.4.2",
diff --git a/web/src/lib/components/collections/EditCollectionModal.svelte b/web/src/lib/components/collections/EditCollectionModal.svelte
index a474a999..d106cafb 100644
--- a/web/src/lib/components/collections/EditCollectionModal.svelte
+++ b/web/src/lib/components/collections/EditCollectionModal.svelte
@@ -31,7 +31,14 @@
 		onclose: () => void;
 	}
 
-	let { open, collection, wsSlug, initialSection, onupdated, onclose }: Props = $props();
+	let {
+		open = $bindable(),
+		collection,
+		wsSlug,
+		initialSection,
+		onupdated,
+		onclose
+	}: Props = $props();
 
 	let confirmArchive = $state(false);
 	let archiving = $state(false);
diff --git a/web/src/routes/[username]/[workspace]/[collection]/[slug]/+page.svelte b/web/src/routes/[username]/[workspace]/[collection]/[slug]/+page.svelte
index 3b9fc79a..98a9dce5 100644
--- a/web/src/routes/[username]/[workspace]/[collection]/[slug]/+page.svelte
+++ b/web/src/routes/[username]/[workspace]/[collection]/[slug]/+page.svelte
@@ -681,8 +681,9 @@
 				<a href="/{username}/{wsSlug}">Home</a>
 				<span class="sep">/</span>
 				{#if item.parent_collection_slug && item.parent_slug}
-					{@const parentColl = allCollections.find(c => c.slug === item.parent_collection_slug)}
-					<a href="/{username}/{wsSlug}/{item.parent_collection_slug}">{parentColl?.icon ?? ''} {parentColl?.name ?? item.parent_collection_slug}</a>
+					{@const parentCollSlug = item.parent_collection_slug}
+					{@const parentColl = allCollections.find(c => c.slug === parentCollSlug)}
+					<a href="/{username}/{wsSlug}/{parentCollSlug}">{parentColl?.icon ?? ''} {parentColl?.name ?? parentCollSlug}</a>
 					<span class="sep">/</span>
 					<a href="/{username}/{wsSlug}/{item.parent_collection_slug}/{item.parent_slug}">{item.parent_ref || item.parent_title}</a>
 					<span class="sep">/</span>
@@ -741,7 +742,7 @@
 			<button
 				class="action-btn star-btn"
 				class:starred={starredStore.isStarred(item.id)}
-				onclick={() => starredStore.toggle(wsSlug, item.slug, item.id)}
+				onclick={() => item && starredStore.toggle(wsSlug, item.slug, item.id)}
 				title={starredStore.isStarred(item.id) ? 'Unstar' : 'Star'}
 			>
 				{starredStore.isStarred(item.id) ? '★' : '☆'}
diff --git a/web/src/routes/auth/cli/[code]/+page.svelte b/web/src/routes/auth/cli/[code]/+page.svelte
index ff329cdd..da00a7f4 100644
--- a/web/src/routes/auth/cli/[code]/+page.svelte
+++ b/web/src/routes/auth/cli/[code]/+page.svelte
@@ -10,6 +10,11 @@
 
 	onMount(async () => {
 		const code = $page.params.code;
+		if (!code) {
+			status = 'error';
+			error = 'Missing CLI session code.';
+			return;
+		}
 
 		try {
 			const session = await api.auth.cli.getSession(code);
@@ -40,6 +45,10 @@
 
 	async function handleApprove() {
 		const code = $page.params.code;
+		if (!code) {
+			error = 'Missing CLI session code.';
+			return;
+		}
 		approving = true;
 		error = '';