diff --git a/lib/features/composer/presentation/composer_controller.dart b/lib/features/composer/presentation/composer_controller.dart
index 59150ba75..02eced7ab 100644
--- a/lib/features/composer/presentation/composer_controller.dart
+++ b/lib/features/composer/presentation/composer_controller.dart
@@ -668,7 +668,9 @@ class ComposerController extends BaseController {
   void sendEmailAction(BuildContext context) async {
     clearFocusEditor(context);
 
-    if (toEmailAddressController.text.isNotEmpty) {
+    if (toEmailAddressController.text.isNotEmpty
+        || ccEmailAddressController.text.isNotEmpty
+        || bccEmailAddressController.text.isNotEmpty) {
       _collapseAllRecipient();
       _autoCreateEmailTag();
     }