diff --git a/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart b/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart
index 60673d8ae..d42847afc 100644
--- a/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart
+++ b/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart
@@ -2902,12 +2902,18 @@ class MailboxDashBoardController extends ReloadableController
             openDefaultMailbox();
             return true;
           }
-        }
-        if (searchController.isSearchEmailRunning) {
+        } else if (searchController.isSearchEmailRunning) {
           dispatchMailboxUIAction(SystemBackToInboxAction());
           return true;
         } else {
-          if (selectedMailbox.value?.isInbox == true) {
+          if (PlatformInfo.isWeb &&
+              currentContext != null &&
+              !responsiveUtils.isDesktop(currentContext!) &&
+              isDrawerOpen
+          ) {
+            closeMailboxMenuDrawer();
+            return true;
+          } else if (selectedMailbox.value?.isInbox == true) {
             pushAndPopAll(AppRoutes.home);
             return true;
           } else {