diff --git a/src/lib/components/AutomationModal.svelte b/src/lib/components/AutomationModal.svelte
index e5395b1104..bf415c2092 100644
--- a/src/lib/components/AutomationModal.svelte
+++ b/src/lib/components/AutomationModal.svelte
@@ -255,13 +255,6 @@
 			<div class="flex items-center gap-0.5 flex-wrap min-w-0 sm:flex-1">
 				<ScheduleDropdown bind:this={scheduleDropdown} side="top" align="start" />
 
-				<TerminalDropdown
-					{terminalServers}
-					bind:terminalServerId
-					bind:terminalCwd
-					side="top"
-					align="start"
-				/>
 				<ModelDropdown
 					bind:model_id
 					items={[...$baseModels, ...agentModels]}
@@ -279,6 +272,13 @@
 					side="top"
 					align="start"
 				/>
+				<TerminalDropdown
+					{terminalServers}
+					bind:terminalServerId
+					bind:terminalCwd
+					side="top"
+					align="start"
+				/>
 			</div>
 
 			<div class="flex items-center justify-end gap-2 shrink-0">
diff --git a/src/lib/components/automations/TerminalDropdown.svelte b/src/lib/components/automations/TerminalDropdown.svelte
index 5e058f10d0..bd41b759a7 100644
--- a/src/lib/components/automations/TerminalDropdown.svelte
+++ b/src/lib/components/automations/TerminalDropdown.svelte
@@ -29,12 +29,16 @@
 	<Dropdown bind:show={showDropdown} {side} {align}>
 		<button
 			type="button"
+			aria-label={terminalLabel}
+			title={terminalLabel}
 			class="flex items-center gap-1.5 px-2.5 py-1.5 rounded-2xl text-xs transition
 				{terminalServerId ? 'text-black dark:text-gray-100' : 'text-gray-600 dark:text-gray-400'}
 				hover:text-gray-900 dark:hover:text-gray-100"
 		>
 			<Cloud className="size-3.5 shrink-0" strokeWidth="2" />
-			<span class="whitespace-nowrap max-w-32 truncate">{terminalLabel}</span>
+			{#if terminalServerId}
+				<span class="whitespace-nowrap max-w-32 truncate">{terminalLabel}</span>
+			{/if}
 			<svg
 				xmlns="http://www.w3.org/2000/svg"
 				fill="none"