diff --git a/frontend/src/lib/components/document/BulkDocumentEditLayout.svelte b/frontend/src/lib/components/document/BulkDocumentEditLayout.svelte
index 0cf98694..c1ece8b1 100644
--- a/frontend/src/lib/components/document/BulkDocumentEditLayout.svelte
+++ b/frontend/src/lib/components/document/BulkDocumentEditLayout.svelte
@@ -220,7 +220,6 @@ async function save() {
 							bind:selectedReceivers={selectedReceivers}
 							bind:dateIso={dateIso}
 							initialSenderName={initialSenderName}
-							autofocus={false}
 						/>
 						<DescriptionSection bind:tags={tags} hideTitle />
 					</ScopeCard>
diff --git a/frontend/src/lib/components/document/WhoWhenSection.svelte b/frontend/src/lib/components/document/WhoWhenSection.svelte
index c8d03e24..679ecc84 100644
--- a/frontend/src/lib/components/document/WhoWhenSection.svelte
+++ b/frontend/src/lib/components/document/WhoWhenSection.svelte
@@ -16,8 +16,7 @@ let {
 	initialLocation = '',
 	initialSenderName = '',
 	suggestedDateIso = '',
-	suggestedSenderName = '',
-	autofocus = true
+	suggestedSenderName = ''
 }: {
 	senderId?: string;
 	selectedReceivers?: Person[];
@@ -27,7 +26,6 @@ let {
 	initialSenderName?: string;
 	suggestedDateIso?: string;
 	suggestedSenderName?: string;
-	autofocus?: boolean;
 } = $props();
 
 let dateDisplay = $state(untrack(() => isoToGerman(initialDateIso)));
@@ -71,7 +69,6 @@ $effect(() => {
 				oninput={handleDateInput}
 				placeholder={m.form_placeholder_date()}
 				maxlength="10"
-				autofocus={autofocus && !initialDateIso}
 				class="block w-full rounded border border-line px-2 py-3 text-sm shadow-sm
                        {dateInvalid ? 'border-red-400 focus:outline-none focus-visible:ring-2 focus-visible:ring-red-500' : 'focus:outline-none focus-visible:ring-2 focus-visible:ring-focus-ring'}"
 				aria-describedby={dateInvalid ? 'date-error' : undefined}
@@ -91,7 +88,6 @@ $effect(() => {
 				bind:value={senderId}
 				initialName={initialSenderName}
 				suggestedName={suggestedSenderName}
-				autofocus={autofocus && !!initialDateIso}
 			/>
 		</div>