diff --git a/lib/features/composer/presentation/widgets/email_address_input_builder.dart b/lib/features/composer/presentation/widgets/email_address_input_builder.dart
index cc135d73f..4fd9c369e 100644
--- a/lib/features/composer/presentation/widgets/email_address_input_builder.dart
+++ b/lib/features/composer/presentation/widgets/email_address_input_builder.dart
@@ -132,6 +132,7 @@ class EmailAddressInputBuilder {
             hasAddButton: false,
             tagSpacing: 8,
             delimiters: [' '],
+            autofocus: _prefixEmailAddress != PrefixEmailAddress.to,
             minTextFieldWidth: 20,
             resetTextOnSubmitted: true,
             suggestionsBoxElevation: 20,