diff --git a/frontend/src/routes/targets/+page.svelte b/frontend/src/routes/targets/+page.svelte
index 93623f0..f9a02b9 100644
--- a/frontend/src/routes/targets/+page.svelte
+++ b/frontend/src/routes/targets/+page.svelte
@@ -134,10 +134,11 @@
 					{/if}
 				</div>
 
-				<!-- Chat selector -->
+				<!-- Chat selector (only shown after bot is selected) -->
+				{#if form.bot_id}
 				<div>
 					<label for="tgt-chat" class="block text-sm font-medium mb-1">{t('telegramBot.selectChat')}</label>
-					{#if form.bot_id && (botChats[form.bot_id] || []).length > 0}
+					{#if (botChats[form.bot_id] || []).length > 0}
 						<select id="tgt-chat" bind:value={form.chat_id}
 							class="w-full px-3 py-2 border border-[var(--color-border)] rounded-md text-sm bg-[var(--color-background)]">
 							<option value="">— {t('telegramBot.selectChat')} —</option>
@@ -151,11 +152,10 @@
 					{:else}
 						<input id="tgt-chat" bind:value={form.chat_id} required placeholder="Chat ID"
 							class="w-full px-3 py-2 border border-[var(--color-border)] rounded-md text-sm bg-[var(--color-background)]" />
-						{#if form.bot_id}
-							<p class="text-xs text-[var(--color-muted-foreground)] mt-1">{t('telegramBot.noChats')}</p>
-						{/if}
+						<p class="text-xs text-[var(--color-muted-foreground)] mt-1">{t('telegramBot.noChats')}</p>
 					{/if}
 				</div>
+				{/if}
 
 				<!-- Telegram media settings -->
 				<details class="border border-[var(--color-border)] rounded-md p-3">