diff --git a/frontend/src/lib/components/SummaryPathDisplay.svelte b/frontend/src/lib/components/SummaryPathDisplay.svelte
index 1d1e5bd7f7..deea9d7be8 100644
--- a/frontend/src/lib/components/SummaryPathDisplay.svelte
+++ b/frontend/src/lib/components/SummaryPathDisplay.svelte
@@ -31,6 +31,7 @@
 	let popoverOpen = $state(false)
 	let own = $state(false)
 	let onBehalfOfEmail = $state<string | undefined>(undefined)
+	let summaryInput: ReturnType<typeof TextInput> | undefined = $state()
 	let hasChanges = $derived(editSummary !== (summary ?? '') || (own && dirtyPath))
 
 	$effect(() => {
@@ -75,6 +76,10 @@
 		usePointerDownOutside
 		excludeSelectors=".drawer"
 		disableFocusTrap
+		openFocus={() => {
+			summaryInput?.focus()
+			return null
+		}}
 		bind:isOpen={popoverOpen}
 	>
 		{#snippet trigger()}
@@ -98,6 +103,7 @@
 				{#if onSaved}
 					<Label label="Summary">
 						<TextInput
+							bind:this={summaryInput}
 							inputProps={{
 								type: 'text',
 								placeholder: 'Short summary',
@@ -146,6 +152,7 @@
 					<label class="block text-primary">
 						<div class="pb-1 text-xs font-semibold text-emphasis">Summary</div>
 						<TextInput
+							bind:this={summaryInput}
 							inputProps={{
 								type: 'text',
 								placeholder: 'Short summary',
diff --git a/frontend/src/lib/components/meltComponents/Popover.svelte b/frontend/src/lib/components/meltComponents/Popover.svelte
index b8f5ea70f3..4d9e9f83ed 100644
--- a/frontend/src/lib/components/meltComponents/Popover.svelte
+++ b/frontend/src/lib/components/meltComponents/Popover.svelte
@@ -37,6 +37,7 @@
 	export let disabled: boolean = false
 	export let documentationLink: string | undefined = undefined
 	export let disableFocusTrap: boolean = false
+	export let openFocus: string | HTMLElement | (() => HTMLElement | null) | null | undefined = undefined
 	export let escapeBehavior: EscapeBehaviorType = 'close'
 	export let enableFlyTransition: boolean = false
 	export let onKeyDown: (e: KeyboardEvent) => void = () => {}
@@ -75,6 +76,7 @@
 		portal: dynamicPortal,
 		disableFocusTrap,
 		escapeBehavior,
+		openFocus,
 		onOpenChange: ({ curr, next }) => {
 			if (curr != next) {
 				dispatch('openChange', next)