diff --git a/frontend/src/lib/shared/dashboard/ThemenWidget.svelte b/frontend/src/lib/shared/dashboard/ThemenWidget.svelte
index 107e570a..cef35418 100644
--- a/frontend/src/lib/shared/dashboard/ThemenWidget.svelte
+++ b/frontend/src/lib/shared/dashboard/ThemenWidget.svelte
@@ -25,7 +25,7 @@ const shownTags = $derived(visibleTags.slice(0, MAX_VISIBLE_TAGS));
 		</h2>
 		<a
 			href="/themen"
-			class="font-sans text-xs text-brand-mint underline-offset-2 hover:underline focus-visible:ring-2 focus-visible:ring-brand-navy focus-visible:outline-none"
+			class="flex min-h-[44px] items-center text-[11px] font-semibold text-ink-2 no-underline focus-visible:ring-2 focus-visible:ring-brand-navy focus-visible:outline-none"
 		>
 			{m.themen_alle()} →
 		</a>
@@ -40,7 +40,7 @@ const shownTags = $derived(visibleTags.slice(0, MAX_VISIBLE_TAGS));
 		>
 			{#each shownTags as tag (tag.id)}
 				<a
-					href="/?tag={encodeURIComponent(tag.name)}"
+					href="/documents?tag={encodeURIComponent(tag.name)}"
 					aria-label="{tag.name}{tag.documentCount > 0
 						? ', ' + m.themen_dokumente({ count: tag.documentCount })
 						: ''}"
diff --git a/frontend/src/routes/themen/+page.svelte b/frontend/src/routes/themen/+page.svelte
index 1a2a02c6..40daf0cf 100644
--- a/frontend/src/routes/themen/+page.svelte
+++ b/frontend/src/routes/themen/+page.svelte
@@ -40,7 +40,7 @@ const visibleTree = $derived.by(() => data.tree.filter(hasAnyDocuments));
 					></div>
 
 					<a
-						href="/?tag={encodeURIComponent(tag.name)}"
+						href="/documents?tag={encodeURIComponent(tag.name)}"
 						aria-label="{tag.name}{tag.documentCount > 0
 							? ', ' + m.themen_dokumente({ count: tag.documentCount })
 							: ''}"
@@ -58,7 +58,7 @@ const visibleTree = $derived.by(() => data.tree.filter(hasAnyDocuments));
 
 						{#each shownChildren as child (child.id)}
 							<a
-								href="/?tag={encodeURIComponent(child.name)}"
+								href="/documents?tag={encodeURIComponent(child.name)}"
 								class="flex min-h-[44px] items-center justify-between px-4 py-2.5 hover:bg-canvas focus-visible:bg-canvas focus-visible:ring-2 focus-visible:ring-brand-navy focus-visible:outline-none focus-visible:ring-inset"
 							>
 								<span class="font-sans text-sm text-ink">{child.name}</span>
@@ -71,7 +71,7 @@ const visibleTree = $derived.by(() => data.tree.filter(hasAnyDocuments));
 
 						{#if hiddenCount > 0}
 							<a
-								href="/?tag={encodeURIComponent(tag.name)}"
+								href="/documents?tag={encodeURIComponent(tag.name)}"
 								class="block min-h-[44px] px-4 py-2.5 font-sans text-sm text-ink-3 hover:bg-canvas hover:text-ink focus-visible:ring-2 focus-visible:ring-brand-navy focus-visible:outline-none focus-visible:ring-inset"
 							>
 								{m.themen_weitere({ count: hiddenCount })} →