diff --git a/frontend/src/lib/components/home/ListFilters.svelte b/frontend/src/lib/components/home/ListFilters.svelte
index b67a634f56..5482c59c42 100644
--- a/frontend/src/lib/components/home/ListFilters.svelte
+++ b/frontend/src/lib/components/home/ListFilters.svelte
@@ -115,7 +115,9 @@
 							<Icon class="mr-0.5" size={12} />
 						{:else if resourceType}
 							{@const SvelteComponent = appIconComponent(filter)}
-							<SvelteComponent height="14px" width="14px" />
+							{#if SvelteComponent}
+								<SvelteComponent height="14px" width="14px" />
+							{/if}
 						{:else if filter.startsWith('u/')}
 							<User class="mr-0.5" size={14} />
 						{:else if filter.startsWith('f/')}
diff --git a/frontend/src/lib/components/icons/appIcon.svelte.ts b/frontend/src/lib/components/icons/appIcon.svelte.ts
index 956df9e60e..7346a4904e 100644
--- a/frontend/src/lib/components/icons/appIcon.svelte.ts
+++ b/frontend/src/lib/components/icons/appIcon.svelte.ts
@@ -8,11 +8,17 @@ let icons = $state.raw<typeof import('./index')>()
 let loading: Promise<unknown> | undefined
 
 function load() {
-	if (!icons) loading ??= import('./index').then((m) => (icons = m))
+	if (!icons)
+		loading ??= import('./index').then(
+			(m) => (icons = m),
+			// Cleared so the next read retries rather than keeping the tab icon-less.
+			() => (loading = undefined)
+		)
 	return icons
 }
 
 export function appIconComponent(name: string | undefined): Component | undefined {
+	if (!name) return undefined
 	return load()?.appIconComponent(name)
 }
 
diff --git a/frontend/src/routes/(root)/(logged)/+layout.svelte b/frontend/src/routes/(root)/(logged)/+layout.svelte
index b65f4f3d92..84600c8649 100644
--- a/frontend/src/routes/(root)/(logged)/+layout.svelte
+++ b/frontend/src/routes/(root)/(logged)/+layout.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
 	import { BROWSER } from 'esm-env'
+	import { isMac } from '$lib/utils'
 
 	import {
 		AppService,
@@ -685,11 +686,30 @@
 		}
 	}
 
-	function openSearchModal(
-		text?: string,
-		stack?: import('$lib/components/common/overlayHost.svelte').OverlayStack
-	): void {
-		globalSearchModal?.openSearchWithPrefilledText(text, stack)
+	type OverlayStack = import('$lib/components/common/overlayHost.svelte').OverlayStack
+	// The modal is a dynamic import, so a request can arrive before it is bound; it is
+	// held here and replayed on bind rather than dropped.
+	let pendingSearchOpen: { text?: string; stack?: OverlayStack } | undefined = $state()
+
+	function openSearchModal(text?: string, stack?: OverlayStack): void {
+		if (globalSearchModal) globalSearchModal.openSearchWithPrefilledText(text, stack)
+		else pendingSearchOpen = { text, stack }
+	}
+
+	$effect(() => {
+		if (globalSearchModal && pendingSearchOpen) {
+			const { text, stack } = pendingSearchOpen
+			pendingSearchOpen = undefined
+			untrack(() => globalSearchModal?.openSearchWithPrefilledText(text, stack))
+		}
+	})
+
+	// Until the modal is bound its own Ctrl/Cmd+K listener does not exist yet.
+	function onSearchShortcutBeforeLoad(e: KeyboardEvent) {
+		if (!globalSearchModal && (isMac() ? e.metaKey : e.ctrlKey) && e.key === 'k') {
+			e.preventDefault()
+			openSearchModal()
+		}
 	}
 
 	setContext('openSearchWithPrefilledText', openSearchModal)
@@ -920,7 +940,7 @@
 	})
 </script>
 
-<svelte:window bind:innerWidth />
+<svelte:window bind:innerWidth onkeydown={onSearchShortcutBeforeLoad} />
 
 <!-- Home + Runs lifted to the top of the workspace nav, sitting with Favorites
      and Search as the primary quick-access cluster. Excluded from SidebarContent