diff --git a/src/lib/components/IndexingProgress.svelte b/src/lib/components/IndexingProgress.svelte
index 2d3cc30..f77f383 100644
--- a/src/lib/components/IndexingProgress.svelte
+++ b/src/lib/components/IndexingProgress.svelte
@@ -1,12 +1,11 @@
 <script lang="ts">
-	import { onMount } from 'svelte';
 	import type { IndexingJob } from '$lib/types';
 
 	let { jobId }: { jobId: string } = $props();
 
 	let job = $state<IndexingJob | null>(null);
 
-	onMount(() => {
+	$effect(() => {
 		job = null;
 		let stopped = false;
 
diff --git a/src/routes/search/+page.svelte b/src/routes/search/+page.svelte
index 5247a9e..8c1b9eb 100644
--- a/src/routes/search/+page.svelte
+++ b/src/routes/search/+page.svelte
@@ -1,11 +1,12 @@
 <script lang="ts">
 	import { goto } from '$app/navigation';
+	import { page } from '$app/state';
+	import { untrack } from 'svelte';
 	import LibraryResult from '$lib/components/search/LibraryResult.svelte';
 	import SnippetCard from '$lib/components/search/SnippetCard.svelte';
 	import SearchInput from '$lib/components/search/SearchInput.svelte';
 	import { copyToClipboard } from '$lib/utils/copy-to-clipboard';
 	import type { LibrarySearchJsonResult, SnippetJson } from '$lib/server/api/formatters';
-	import { onMount } from 'svelte';
 
 	// ---------------------------------------------------------------------------
 	// State
@@ -38,9 +39,10 @@
 	// Initialise from URL params on mount
 	// ---------------------------------------------------------------------------
 
-	onMount(() => {
-		const libParam = new URL(window.location.href).searchParams.get('lib');
-		const qParam = new URL(window.location.href).searchParams.get('q');
+	$effect(() => {
+		// untrack prevents page.url changes (e.g. from goto()) from re-running this effect
+		const libParam = untrack(() => page.url.searchParams.get('lib'));
+		const qParam = untrack(() => page.url.searchParams.get('q'));
 
 		if (libParam) {
 			selectedLibraryId = libParam;
diff --git a/src/routes/settings/+page.svelte b/src/routes/settings/+page.svelte
index 318b62a..6e860d4 100644
--- a/src/routes/settings/+page.svelte
+++ b/src/routes/settings/+page.svelte
@@ -1,5 +1,4 @@
 <script lang="ts">
-	import { onMount } from 'svelte';
 	import StatBadge from '$lib/components/StatBadge.svelte';
 
 	// ---------------------------------------------------------------------------
@@ -53,7 +52,7 @@
 	// Load current config + probe local provider on mount
 	// ---------------------------------------------------------------------------
 
-	onMount(() => {
+	$effect(() => {
 		let cancelled = false;
 
 		(async () => {