diff --git a/apps/mobile/src/app/(app)/agent-chat/mode-picker.tsx b/apps/mobile/src/app/(app)/agent-chat/mode-picker.tsx
index c2ead3bca0..2d2d9d3b67 100644
--- a/apps/mobile/src/app/(app)/agent-chat/mode-picker.tsx
+++ b/apps/mobile/src/app/(app)/agent-chat/mode-picker.tsx
@@ -81,6 +81,7 @@ export default function ModePickerScreen() {
           label,
           description,
         })}
+        accessibilityState={{ selected }}
       >
         <Icon size={20} color={colors.foreground} />
         <View className="flex-1">
diff --git a/apps/mobile/src/app/(app)/agent-chat/repo-picker.tsx b/apps/mobile/src/app/(app)/agent-chat/repo-picker.tsx
index ea1126da52..966366e49b 100644
--- a/apps/mobile/src/app/(app)/agent-chat/repo-picker.tsx
+++ b/apps/mobile/src/app/(app)/agent-chat/repo-picker.tsx
@@ -177,6 +177,7 @@ export default function RepoPickerScreen() {
             const repo = item.repo;
             const platformName = t(REPO_PLATFORM_LABEL_KEYS[repo.platform]);
             const rowLabel = `${platformName} ${repo.fullName}`;
+            const isSelected = bridge.currentValue === `${repo.platform}:${repo.fullName}`;
             return (
               <Pressable
                 key={item.key}
@@ -186,6 +187,7 @@ export default function RepoPickerScreen() {
                 }}
                 accessibilityRole="button"
                 accessibilityLabel={rowLabel}
+                accessibilityState={{ selected: isSelected }}
               >
                 {repo.isPrivate ? (
                   <Lock size={14} color={colors.mutedForeground} />
@@ -201,9 +203,7 @@ export default function RepoPickerScreen() {
                 <Text className="flex-1 text-base text-foreground" numberOfLines={1}>
                   {repo.fullName}
                 </Text>
-                {bridge.currentValue === `${repo.platform}:${repo.fullName}` ? (
-                  <Check size={18} color={colors.primary} />
-                ) : null}
+                {isSelected ? <Check size={18} color={colors.primary} /> : null}
               </Pressable>
             );
           })}