diff --git a/frontend/src/lib/document/DocumentPickerDropdown.svelte b/frontend/src/lib/document/DocumentPickerDropdown.svelte
index c6de5f4e..e7d30706 100644
--- a/frontend/src/lib/document/DocumentPickerDropdown.svelte
+++ b/frontend/src/lib/document/DocumentPickerDropdown.svelte
@@ -1,3 +1,7 @@
+<script module>
+let _uid = 0;
+</script>
+
 <script lang="ts">
 import { m } from '$lib/paraglide/messages.js';
 import { clickOutside } from '$lib/shared/actions/clickOutside';
@@ -19,7 +23,7 @@ let {
 	onSelect
 }: Props = $props();
 
-const listboxId = 'doc-picker-listbox';
+const listboxId = `doc-picker-listbox-${++_uid}`;
 
 const picker = createDocumentTypeahead();
 
@@ -61,7 +65,6 @@ function handleSelect(doc: DocumentOption) {
 	{#if picker.isOpen && (picker.results.length > 0 || picker.loading)}
 		<ul
 			id={listboxId}
-			role="listbox"
 			class="ring-opacity-5 absolute z-50 mt-1 max-h-60 w-full overflow-auto rounded-md bg-surface py-1 text-sm shadow-lg ring-1 ring-black"
 		>
 			{#if picker.loading}
@@ -70,8 +73,6 @@ function handleSelect(doc: DocumentOption) {
 				{#each picker.results as doc (doc.id)}
 					{@const disabled = alreadyAddedIds.has(doc.id!)}
 					<li
-						role="option"
-						aria-selected={false}
 						aria-disabled={disabled}
 						onclick={() => handleSelect(doc)}
 						onkeydown={(e) => e.key === 'Enter' && handleSelect(doc)}
diff --git a/frontend/src/lib/document/DocumentPickerDropdown.svelte.spec.ts b/frontend/src/lib/document/DocumentPickerDropdown.svelte.spec.ts
index e60ef3be..48df16dc 100644
--- a/frontend/src/lib/document/DocumentPickerDropdown.svelte.spec.ts
+++ b/frontend/src/lib/document/DocumentPickerDropdown.svelte.spec.ts
@@ -53,9 +53,12 @@ describe('DocumentPickerDropdown — already-added indicator', () => {
 		await userEvent.fill(page.getByRole('combobox'), 'Brief');
 		await waitForDebounce();
 
-		const disabledOption = page.getByRole('option', { name: /Brief von Eugenie/i });
-		await expect.element(disabledOption).toHaveAttribute('aria-disabled', 'true');
-		// Screen-reader text "bereits enthalten" must be present in the option
+		const disabledItem = page
+			.getByText(/Brief von Eugenie/i)
+			.element()
+			.closest('li')!;
+		expect(disabledItem.getAttribute('aria-disabled')).toBe('true');
+		// Screen-reader text "bereits enthalten" must be present in the item
 		await expect.element(page.getByText(/bereits enthalten/i)).toBeInTheDocument();
 	});
 });
@@ -69,7 +72,7 @@ describe('DocumentPickerDropdown — selection', () => {
 
 		await userEvent.fill(page.getByRole('combobox'), 'Brief');
 		await waitForDebounce();
-		await userEvent.click(page.getByRole('option', { name: /Brief von Eugenie/i }));
+		await userEvent.click(page.getByText(/Brief von Eugenie/i));
 
 		expect(onSelect).toHaveBeenCalledWith(expect.objectContaining({ id: 'd1' }));
 	});
@@ -85,8 +88,7 @@ describe('DocumentPickerDropdown — selection', () => {
 
 		await userEvent.fill(page.getByRole('combobox'), 'Brief');
 		await waitForDebounce();
-		// aria-disabled items are not "enabled" — userEvent refuses them; use force click
-		await page.getByRole('option', { name: /Brief von Eugenie/i }).click({ force: true });
+		await page.getByText(/Brief von Eugenie/i).click({ force: true });
 
 		expect(onSelect).not.toHaveBeenCalled();
 	});