diff --git a/packages/app/src/components/agent-list.tsx b/packages/app/src/components/agent-list.tsx
index 832dc1f78..8cc213488 100644
--- a/packages/app/src/components/agent-list.tsx
+++ b/packages/app/src/components/agent-list.tsx
@@ -132,23 +132,21 @@ export function AgentList({ agents, isRefreshing = false, onRefresh }: AgentList
                   </Text>
                 </View>
 
-                {agent.requiresAttention && (
-                  <View style={styles.statusBadge}>
-                    <View style={[styles.statusDot, { backgroundColor: "#22c55e" }]} />
-                    <Text style={[styles.statusText, { color: "#22c55e" }]}>
-                      Finished
-                    </Text>
-                  </View>
-                )}
-
-                {isRunning && (
+                {isRunning ? (
                   <View style={styles.statusBadge}>
                     <View style={[styles.statusDot, { backgroundColor: "#3b82f6" }]} />
                     <Text style={[styles.statusText, { color: "#3b82f6" }]}>
                       Running
                     </Text>
                   </View>
-                )}
+                ) : agent.requiresAttention ? (
+                  <View style={styles.statusBadge}>
+                    <View style={[styles.statusDot, { backgroundColor: "#22c55e" }]} />
+                    <Text style={[styles.statusText, { color: "#22c55e" }]}>
+                      Finished
+                    </Text>
+                  </View>
+                ) : null}
               </View>
 
               <Text style={styles.timeAgo}>