diff --git a/lib/features/composer/presentation/composer_controller.dart b/lib/features/composer/presentation/composer_controller.dart
index 416e562d0..4dc04f491 100644
--- a/lib/features/composer/presentation/composer_controller.dart
+++ b/lib/features/composer/presentation/composer_controller.dart
@@ -1817,14 +1817,9 @@ class ComposerController extends BaseController {
     }
   }
 
-  void closeComposer(BuildContext context) {
-    FocusScope.of(context).unfocus();
-
-    if (PlatformInfo.isWeb) {
-      mailboxDashBoardController.closeComposerOverlay();
-    } else {
-      popBack();
-    }
+  void handleClickDeleteComposer(BuildContext context) {
+    clearFocus(context);
+    _closeComposerAction();
   }
 
   void _onEditorFocusOnMobile() {
diff --git a/lib/features/composer/presentation/composer_view.dart b/lib/features/composer/presentation/composer_view.dart
index 6d8edc8dc..bdb3d6339 100644
--- a/lib/features/composer/presentation/composer_view.dart
+++ b/lib/features/composer/presentation/composer_view.dart
@@ -360,7 +360,7 @@ class ComposerView extends GetWidget<ComposerController> {
                 )
               ),
               TabletBottomBarComposerWidget(
-                deleteComposerAction: () => controller.closeComposer(context),
+                deleteComposerAction: () => controller.handleClickDeleteComposer(context),
                 saveToDraftAction: () => controller.saveToDraftAction(context),
                 sendMessageAction: () => controller.validateInformationBeforeSending(context),
                 requestReadReceiptAction: (position) {
@@ -466,7 +466,7 @@ class ComposerView extends GetWidget<ComposerController> {
           padding: ComposerStyle.popupItemPadding,
           onCallbackAction: () {
             popBack();
-            controller.closeComposer(context);
+            controller.handleClickDeleteComposer(context);
           },
         )
       ),
diff --git a/lib/features/composer/presentation/composer_view_web.dart b/lib/features/composer/presentation/composer_view_web.dart
index f01067f6b..409921903 100644
--- a/lib/features/composer/presentation/composer_view_web.dart
+++ b/lib/features/composer/presentation/composer_view_web.dart
@@ -440,7 +440,7 @@ class ComposerView extends GetWidget<ComposerController> {
                 attachFileAction: () => controller.openFilePickerByType(context, FileType.any),
                 insertImageAction: () => controller.insertImage(context, constraints.maxWidth),
                 showCodeViewAction: controller.richTextWebController.toggleCodeView,
-                deleteComposerAction: () => controller.closeComposer(context),
+                deleteComposerAction: () => controller.handleClickDeleteComposer(context),
                 saveToDraftAction: () => controller.saveToDraftAction(context),
                 sendMessageAction: () => controller.validateInformationBeforeSending(context),
                 requestReadReceiptAction: (position) {
@@ -657,7 +657,7 @@ class ComposerView extends GetWidget<ComposerController> {
                 attachFileAction: () => controller.openFilePickerByType(context, FileType.any),
                 insertImageAction: () => controller.insertImage(context, constraints.maxWidth),
                 showCodeViewAction: controller.richTextWebController.toggleCodeView,
-                deleteComposerAction: () => controller.closeComposer(context),
+                deleteComposerAction: () => controller.handleClickDeleteComposer(context),
                 saveToDraftAction: () => controller.saveToDraftAction(context),
                 sendMessageAction: () => controller.validateInformationBeforeSending(context),
                 requestReadReceiptAction: (position) {
@@ -753,7 +753,7 @@ class ComposerView extends GetWidget<ComposerController> {
           padding: ComposerStyle.popupItemPadding,
           onCallbackAction: () {
             popBack();
-            controller.closeComposer(context);
+            controller.handleClickDeleteComposer(context);
           },
         )
       ),