diff --git a/lib/features/composer/presentation/composer_controller.dart b/lib/features/composer/presentation/composer_controller.dart
index ba69eb76b..210e479ae 100644
--- a/lib/features/composer/presentation/composer_controller.dart
+++ b/lib/features/composer/presentation/composer_controller.dart
@@ -931,7 +931,7 @@ class ComposerController extends BaseController
         onCancelAction: () {
           _sendButtonState = ButtonState.enabled;
         }
-      );
+      ).whenComplete(() => _sendButtonState = ButtonState.enabled);
       return;
     }
 
@@ -1094,7 +1094,7 @@ class ComposerController extends BaseController
           _closeComposerAction(closeOverlays: true);
         }
       },
-    );
+    ).whenComplete(() => _sendButtonState = ButtonState.enabled);
   }
 
   void _checkContactPermission() async {
diff --git a/lib/features/composer/presentation/extensions/attachment_detection_extension.dart b/lib/features/composer/presentation/extensions/attachment_detection_extension.dart
index b42f1b548..1c802d322 100644
--- a/lib/features/composer/presentation/extensions/attachment_detection_extension.dart
+++ b/lib/features/composer/presentation/extensions/attachment_detection_extension.dart
@@ -28,7 +28,7 @@ extension AttachmentDetectionExtension on ComposerController {
     }
   }
 
-  void showAttachmentReminderModal({
+  Future<void> showAttachmentReminderModal({
     required BuildContext context,
     required List<String> keywords,
     required VoidCallback onConfirmAction,
@@ -37,7 +37,7 @@ extension AttachmentDetectionExtension on ComposerController {
     final appLocalizations = AppLocalizations.of(context);
     String formattedKeywords = keywords.map((k) => '"$k"').join(', ');
     log('$runtimeType::showAttachmentReminderModal:formattedKeywords = $formattedKeywords');
-    MessageDialogActionManager().showConfirmDialogAction(
+    return MessageDialogActionManager().showConfirmDialogAction(
       key: const Key('attachment_reminder_modal'),
       context,
       title: appLocalizations.attachmentReminderModalTitle,