diff --git a/src/lib/components/chat/MessageInput/TerminalMenu.svelte b/src/lib/components/chat/MessageInput/TerminalMenu.svelte
index a53779e75d..83679adc7a 100644
--- a/src/lib/components/chat/MessageInput/TerminalMenu.svelte
+++ b/src/lib/components/chat/MessageInput/TerminalMenu.svelte
@@ -208,6 +208,8 @@
 						{#each directTerminals as terminal}
 							<button
 								type="button"
+								role="menuitemradio"
+								aria-checked={$selectedTerminalId === terminal.url}
 								class="flex w-full justify-between gap-2 items-center h-[1.6875rem] px-2 text-[0.8125rem] font-normal cursor-pointer rounded-xl {$selectedTerminalId ===
 								terminal.url
 									? 'bg-gray-50/40 dark:bg-gray-800/40'
@@ -277,6 +279,8 @@
 						{#each systemTerminals as terminal}
 							<button
 								type="button"
+								role="menuitemradio"
+								aria-checked={$selectedTerminalId === terminal.id}
 								class="flex w-full justify-between gap-2 items-center h-[1.6875rem] px-2 text-[0.8125rem] font-normal cursor-pointer rounded-xl {$selectedTerminalId ===
 								terminal.id
 									? 'bg-gray-50/40 dark:bg-gray-800/40'
diff --git a/src/lib/components/common/Dropdown.svelte b/src/lib/components/common/Dropdown.svelte
index aca4a0c857..925a845ecc 100644
--- a/src/lib/components/common/Dropdown.svelte
+++ b/src/lib/components/common/Dropdown.svelte
@@ -258,8 +258,15 @@
 
 		if (shouldFocusContent) {
 			shouldFocusContent = false;
+			const firstControl = contentEl?.querySelector<HTMLElement>(
+				'button:not([disabled]), a[href], input'
+			);
 			(
-				contentEl?.querySelector<HTMLElement>('button:not([disabled]), a[href], input') ?? contentEl
+				(firstControl?.matches('input')
+					? firstControl
+					: contentEl?.querySelector<HTMLElement>('[role^="menuitem"]:not([disabled])')) ??
+				firstControl ??
+				contentEl
 			)?.focus();
 		}
 	}