diff --git a/ui/src/ui/views/agents.ts b/ui/src/ui/views/agents.ts
index 4e8b9a065ba..325584171a6 100644
--- a/ui/src/ui/views/agents.ts
+++ b/ui/src/ui/views/agents.ts
@@ -16,7 +16,12 @@ import {
   renderAgentCron,
 } from "./agents-panels-status-files.ts";
 import { renderAgentTools, renderAgentSkills } from "./agents-panels-tools-skills.ts";
-import { agentBadgeText, buildAgentContext, normalizeAgentLabel } from "./agents-utils.ts";
+import {
+  agentBadgeText,
+  buildAgentContext,
+  normalizeAgentLabel,
+  resolveAgentEmoji,
+} from "./agents-utils.ts";
 
 export type AgentsPanel = "overview" | "files" | "tools" | "skills" | "channels" | "cron";
 
@@ -149,13 +154,16 @@ export function renderAgents(props: AgentsProps) {
                     ? html`
                         <option value="">No agents</option>
                       `
-                    : agents.map(
-                        (agent) => html`
+                    : agents.map((agent) => {
+                        const emoji = resolveAgentEmoji(agent);
+                        const label = normalizeAgentLabel(agent);
+                        const badge = agentBadgeText(agent.id, defaultId);
+                        return html`
                         <option value=${agent.id} ?selected=${agent.id === selectedId}>
-                          ${normalizeAgentLabel(agent)}${agentBadgeText(agent.id, defaultId) ? ` (${agentBadgeText(agent.id, defaultId)})` : ""}
+                          ${emoji ? `${emoji} ` : ""}${label}${badge ? ` (${badge})` : ""}
                         </option>
-                      `,
-                      )
+                      `;
+                      })
                 }
               </select>
             </div>