diff --git a/lib/features/base/mixin/popup_context_menu_action_mixin.dart b/lib/features/base/mixin/popup_context_menu_action_mixin.dart
index 75a70adcf..d88c2e8ce 100644
--- a/lib/features/base/mixin/popup_context_menu_action_mixin.dart
+++ b/lib/features/base/mixin/popup_context_menu_action_mixin.dart
@@ -77,7 +77,7 @@ mixin PopupContextMenuActionMixin {
       position: position ?? const RelativeRect.fromLTRB(16, 40, 16, 16),
       color: Colors.white,
       surfaceTintColor: Colors.white,
-      menuPadding: const EdgeInsets.only(top: 8, bottom: 8),
+      menuPadding: const EdgeInsets.symmetric(vertical: 8),
       elevation: 8,
       shape: const RoundedRectangleBorder(
         borderRadius: BorderRadius.all(Radius.circular(6)),
diff --git a/lib/features/mailbox/presentation/base_mailbox_view.dart b/lib/features/mailbox/presentation/base_mailbox_view.dart
index 97c33c430..ebcb11e70 100644
--- a/lib/features/mailbox/presentation/base_mailbox_view.dart
+++ b/lib/features/mailbox/presentation/base_mailbox_view.dart
@@ -210,7 +210,7 @@ abstract class BaseMailboxView extends GetWidget<MailboxController>
         onMenuActionClick: PlatformInfo.isMobile
           ? null
           : (position, mailboxNode) {
-              controller.openMailboxContextMenuAction(
+              return controller.openMailboxContextMenuAction(
                 context,
                 position,
                 mailboxNode.item,
diff --git a/lib/features/mailbox/presentation/extensions/handle_mailbox_action_extension.dart b/lib/features/mailbox/presentation/extensions/handle_mailbox_action_extension.dart
index 314b844f7..9583ed01b 100644
--- a/lib/features/mailbox/presentation/extensions/handle_mailbox_action_extension.dart
+++ b/lib/features/mailbox/presentation/extensions/handle_mailbox_action_extension.dart
@@ -64,7 +64,7 @@ extension HandleMailboxActionExtension on MailboxController {
     );
   }
 
-  void openMailboxContextMenuAction(
+  Future<void> openMailboxContextMenuAction(
     BuildContext context,
     RelativeRect position,
     PresentationMailbox mailbox,
@@ -85,9 +85,9 @@ extension HandleMailboxActionExtension on MailboxController {
         AppLocalizations.of(context),
       );
 
-      if (contextMenuActions.isEmpty) return;
+      if (contextMenuActions.isEmpty) return Future.value();
 
-      openBottomSheetContextMenuAction(
+      return openBottomSheetContextMenuAction(
         context: context,
         itemActions: contextMenuActions,
         onContextMenuActionClick: (menuAction) => handleMailboxAction(
@@ -106,7 +106,7 @@ extension HandleMailboxActionExtension on MailboxController {
         isSubAddressingSupported,
       );
 
-      if (popupMenuActions.isEmpty) return;
+      if (popupMenuActions.isEmpty) return Future.value();
 
       final popupMenuItems = popupMenuActions.map((menuAction) {
         return PopupMenuItem(
@@ -121,7 +121,7 @@ extension HandleMailboxActionExtension on MailboxController {
         );
       }).toList();
 
-      openPopupMenuAction(context, position, popupMenuItems);
+      return openPopupMenuAction(context, position, popupMenuItems);
     }
   }
 }
\ No newline at end of file
diff --git a/lib/features/mailbox/presentation/utils/mailbox_method_action_define.dart b/lib/features/mailbox/presentation/utils/mailbox_method_action_define.dart
index 5f42fe0b1..f9ac67a5b 100644
--- a/lib/features/mailbox/presentation/utils/mailbox_method_action_define.dart
+++ b/lib/features/mailbox/presentation/utils/mailbox_method_action_define.dart
@@ -5,7 +5,7 @@ import 'package:model/mailbox/presentation_mailbox.dart';
 import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_node.dart';
 
 typedef OnClickOpenMailboxAction = void Function(PresentationMailbox);
-typedef OnClickOpenMenuMailboxAction = void Function(RelativeRect, PresentationMailbox);
+typedef OnClickOpenMenuMailboxAction = Future<void> Function(RelativeRect, PresentationMailbox);
 typedef OnSelectMailboxAction = void Function(PresentationMailbox);
 typedef OnDragEmailToMailboxAccepted = void Function(List<PresentationEmail>, PresentationMailbox);
 typedef OnLongPressMailboxAction = void Function(PresentationMailbox);
@@ -13,7 +13,7 @@ typedef OnLongPressMailboxAction = void Function(PresentationMailbox);
 typedef OnClickExpandMailboxNodeAction = void Function(MailboxNode, GlobalKey itemKey);
 typedef OnClickOpenMailboxNodeAction = void Function(MailboxNode);
 typedef OnSelectMailboxNodeAction = void Function(MailboxNode);
-typedef OnClickOpenMenuMailboxNodeAction = void Function(RelativeRect, MailboxNode);
+typedef OnClickOpenMenuMailboxNodeAction = Future<void> Function(RelativeRect, MailboxNode);
 typedef OnLongPressMailboxNodeAction = void Function(MailboxNode);
 typedef OnClickSubscribeMailboxAction = void Function(MailboxNode);
 typedef OnEmptyMailboxActionCallback = void Function(MailboxNode);
\ No newline at end of file
diff --git a/lib/features/mailbox/presentation/widgets/label_mailbox_item_widget.dart b/lib/features/mailbox/presentation/widgets/label_mailbox_item_widget.dart
index 077d58206..348586c21 100644
--- a/lib/features/mailbox/presentation/widgets/label_mailbox_item_widget.dart
+++ b/lib/features/mailbox/presentation/widgets/label_mailbox_item_widget.dart
@@ -2,13 +2,16 @@ import 'package:core/presentation/extensions/color_extension.dart';
 import 'package:core/presentation/resources/image_paths.dart';
 import 'package:core/presentation/utils/responsive_utils.dart';
 import 'package:core/presentation/utils/theme_utils.dart';
+import 'package:core/presentation/views/button/tmail_button_widget.dart';
 import 'package:core/presentation/views/text/text_overflow_builder.dart';
+import 'package:core/utils/platform_info.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:model/extensions/presentation_mailbox_extension.dart';
 import 'package:tmail_ui_user/features/mailbox/presentation/extensions/presentation_mailbox_extension.dart';
 import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_node.dart';
 import 'package:tmail_ui_user/features/mailbox/presentation/styles/label_mailbox_item_widget_styles.dart';
+import 'package:tmail_ui_user/features/mailbox/presentation/styles/trailing_mailbox_item_widget_styles.dart';
 import 'package:tmail_ui_user/features/mailbox/presentation/utils/mailbox_method_action_define.dart';
 import 'package:tmail_ui_user/features/mailbox/presentation/widgets/empty_mailbox_popup_dialog_widget.dart';
 import 'package:tmail_ui_user/features/mailbox/presentation/widgets/mailbox_expand_button.dart';
@@ -47,6 +50,7 @@ class _LabelMailboxItemWidgetState extends State<LabelMailboxItemWidget> {
   final _imagePaths = Get.find<ImagePaths>();
   
   bool _popupVisible = false;
+  bool _morePopupMenuVisible = false;
 
   @override
   Widget build(BuildContext context) {
@@ -104,7 +108,7 @@ class _LabelMailboxItemWidgetState extends State<LabelMailboxItemWidget> {
       responsiveUtils: _responsiveUtils,
       imagePaths: _imagePaths,
       isItemHovered: widget.isItemHovered,
-      onMenuActionClick: widget.onMenuActionClick,
+      isShowMoreButton: _shouldShowMorePopupMenu,
     );
 
     final childWidget = Row(
@@ -122,6 +126,45 @@ class _LabelMailboxItemWidgetState extends State<LabelMailboxItemWidget> {
               onPopupVisibleChange: _onPopupVisibleChange,
             ),
           ),
+        if (_showCleanButton(context) && !_shouldShowMorePopupMenu)
+          const Padding(
+            padding: TrailingMailboxItemWidgetStyles.menuIconPadding,
+            child: SizedBox(width: TrailingMailboxItemWidgetStyles.menuIconSize),
+          ),
+        if (_showMoreButton(context))
+          Offstage(
+            offstage: !_shouldShowMorePopupMenu,
+            child: TMailButtonWidget.fromIcon(
+              margin: _responsiveUtils.isDesktop(context) &&
+                      widget.mailboxNode.item.allowedHasEmptyAction
+                  ? EdgeInsets.zero
+                  : TrailingMailboxItemWidgetStyles.menuIconMargin,
+              icon: _imagePaths.icMoreVertical,
+              iconSize: widget.mailboxNode.item.isTeamMailboxes
+                  ? 17
+                  : TrailingMailboxItemWidgetStyles.menuIconSize,
+              padding: widget.mailboxNode.item.isTeamMailboxes
+                  ? const EdgeInsets.all(3)
+                  : TrailingMailboxItemWidgetStyles.menuIconPadding,
+              backgroundColor: _morePopupMenuVisible
+                  ? Theme.of(context).colorScheme.outline.withOpacity(0.08)
+                  : TrailingMailboxItemWidgetStyles.menuIconBackgroundColor,
+              onTapActionAtPositionCallback: (position) {
+                  if (!_responsiveUtils.isScreenWithShortestSide(context)) {
+                    _onMorePopupMenuVisibleChange(true);
+                  }
+
+                  widget.onMenuActionClick
+                      ?.call(position, widget.mailboxNode)
+                      .whenComplete(() {
+                        if (context.mounted &&
+                            !_responsiveUtils.isScreenWithShortestSide(context)) {
+                          _onMorePopupMenuVisibleChange(false);
+                        }
+                      });
+              },
+            ),
+          ),
         trailingWidget,
       ],
     );
@@ -153,13 +196,24 @@ class _LabelMailboxItemWidgetState extends State<LabelMailboxItemWidget> {
     }
   }
 
+  void _onMorePopupMenuVisibleChange(bool visible) {
+    if (_morePopupMenuVisible != visible) {
+      setState(() => _morePopupMenuVisible = visible);
+    }
+  }
+
   bool get _shouldShowPopup => widget.isItemHovered || _popupVisible;
 
+  bool get _shouldShowMorePopupMenu =>
+      widget.isItemHovered || _morePopupMenuVisible;
+
   bool _showCleanButton(BuildContext context) {
     return _responsiveUtils.isWebDesktop(context) &&
         widget.mailboxNode.item.allowedHasEmptyAction;
   }
 
+  bool _showMoreButton(BuildContext context) => PlatformInfo.isWeb;
+
   TextStyle get _displayNameTextStyle {
     if (widget.isSelected) {
       return ThemeUtils.textStyleInter700(
diff --git a/lib/features/mailbox/presentation/widgets/trailing_mailbox_item_widget.dart b/lib/features/mailbox/presentation/widgets/trailing_mailbox_item_widget.dart
index 40edad7d3..d6b6d95e7 100644
--- a/lib/features/mailbox/presentation/widgets/trailing_mailbox_item_widget.dart
+++ b/lib/features/mailbox/presentation/widgets/trailing_mailbox_item_widget.dart
@@ -1,13 +1,11 @@
 
 import 'package:core/presentation/resources/image_paths.dart';
 import 'package:core/presentation/utils/responsive_utils.dart';
-import 'package:core/presentation/views/button/tmail_button_widget.dart';
 import 'package:core/utils/platform_info.dart';
 import 'package:flutter/material.dart';
 import 'package:model/extensions/presentation_mailbox_extension.dart';
 import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_node.dart';
 import 'package:tmail_ui_user/features/mailbox/presentation/styles/trailing_mailbox_item_widget_styles.dart';
-import 'package:tmail_ui_user/features/mailbox/presentation/utils/mailbox_method_action_define.dart';
 import 'package:tmail_ui_user/features/mailbox/presentation/widgets/count_of_emails_widget.dart';
 
 class TrailingMailboxItemWidget extends StatelessWidget {
@@ -16,7 +14,7 @@ class TrailingMailboxItemWidget extends StatelessWidget {
   final ImagePaths imagePaths;
   final ResponsiveUtils responsiveUtils;
   final bool isItemHovered;
-  final OnClickOpenMenuMailboxNodeAction? onMenuActionClick;
+  final bool isShowMoreButton;
 
   const TrailingMailboxItemWidget({
     super.key,
@@ -24,28 +22,14 @@ class TrailingMailboxItemWidget extends StatelessWidget {
     required this.imagePaths,
     required this.responsiveUtils,
     this.isItemHovered = false,
-    this.onMenuActionClick,
+    this.isShowMoreButton = false,
   });
 
   @override
   Widget build(BuildContext context) {
     if (PlatformInfo.isWeb) {
-      if (isItemHovered) {
-        return TMailButtonWidget.fromIcon(
-          margin: responsiveUtils.isDesktop(context) && mailboxNode.item.allowedHasEmptyAction
-            ? EdgeInsets.zero
-            : TrailingMailboxItemWidgetStyles.menuIconMargin,
-          icon: imagePaths.icMoreVertical,
-          iconSize: mailboxNode.item.isTeamMailboxes
-            ? 17
-            : TrailingMailboxItemWidgetStyles.menuIconSize,
-          padding:  mailboxNode.item.isTeamMailboxes
-            ? const EdgeInsets.all(3)
-            : TrailingMailboxItemWidgetStyles.menuIconPadding,
-          backgroundColor: TrailingMailboxItemWidgetStyles.menuIconBackgroundColor,
-          onTapActionAtPositionCallback: (position) => onMenuActionClick?.call(position, mailboxNode),
-        );
-      } else if (responsiveUtils.isDesktop(context) && mailboxNode.item.allowedHasEmptyAction) {
+      if (isShowMoreButton ||
+          responsiveUtils.isDesktop(context) && mailboxNode.item.allowedHasEmptyAction) {
         return const SizedBox();
       } else if (mailboxNode.item.allowedToDisplayCountOfUnreadEmails) {
         return Padding(
diff --git a/lib/features/search/mailbox/presentation/search_mailbox_view.dart b/lib/features/search/mailbox/presentation/search_mailbox_view.dart
index e963e2cd7..368b3ffb4 100644
--- a/lib/features/search/mailbox/presentation/search_mailbox_view.dart
+++ b/lib/features/search/mailbox/presentation/search_mailbox_view.dart
@@ -182,9 +182,7 @@ class SearchMailboxView extends GetWidget<SearchMailboxController>
           return LayoutBuilder(builder: (context, constraints) {
             final mailboxCurrent = controller.listMailboxSearched[index];
             return MailboxSearchedItemBuilder(
-              controller.imagePaths,
-              controller.responsiveUtils,
-              mailboxCurrent,
+              presentationMailbox: mailboxCurrent,
               maxWidth: constraints.maxWidth,
               onDragEmailToMailboxAccepted: controller.dashboardController.dragSelectedMultipleEmailToMailboxAction,
               onClickOpenMailboxAction: (mailbox) => controller.openMailboxAction(context, mailbox),
@@ -256,7 +254,7 @@ class SearchMailboxView extends GetWidget<SearchMailboxController>
     );
   }
 
-  void _openMailboxMenuAction(
+  Future<void> _openMailboxMenuAction(
     BuildContext context,
     PresentationMailbox mailbox,
     {RelativeRect? position}
@@ -280,9 +278,9 @@ class SearchMailboxView extends GetWidget<SearchMailboxController>
         AppLocalizations.of(context),
       );
 
-      if (contextMenuActions.isEmpty) return;
+      if (contextMenuActions.isEmpty) return Future.value();
 
-      controller.openBottomSheetContextMenuAction(
+      return controller.openBottomSheetContextMenuAction(
         context: context,
         itemActions: contextMenuActions,
         onContextMenuActionClick: (menuAction) => controller.handleMailboxAction(
@@ -301,7 +299,7 @@ class SearchMailboxView extends GetWidget<SearchMailboxController>
         isSubAddressingSupported,
       );
 
-      if (popupMenuActions.isEmpty) return;
+      if (popupMenuActions.isEmpty) Future.value();
 
       final popupMenuItems = popupMenuActions.map((menuAction) {
         return PopupMenuItem(
@@ -320,7 +318,7 @@ class SearchMailboxView extends GetWidget<SearchMailboxController>
         );
       }).toList();
 
-      controller.openPopupMenuAction(context, position, popupMenuItems);
+      return controller.openPopupMenuAction(context, position, popupMenuItems);
     }
   }
 }
\ No newline at end of file
diff --git a/lib/features/search/mailbox/presentation/widgets/mailbox_searched_item_builder.dart b/lib/features/search/mailbox/presentation/widgets/mailbox_searched_item_builder.dart
index ae0f70592..48ae1a370 100644
--- a/lib/features/search/mailbox/presentation/widgets/mailbox_searched_item_builder.dart
+++ b/lib/features/search/mailbox/presentation/widgets/mailbox_searched_item_builder.dart
@@ -1,6 +1,7 @@
 import 'package:core/presentation/extensions/color_extension.dart';
 import 'package:core/presentation/resources/image_paths.dart';
 import 'package:core/presentation/utils/responsive_utils.dart';
+import 'package:core/presentation/views/button/tmail_button_widget.dart';
 import 'package:core/presentation/views/responsive/responsive_widget.dart';
 import 'package:core/presentation/views/text/text_overflow_builder.dart';
 import 'package:core/utils/platform_info.dart';
@@ -8,6 +9,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:focused_menu_custom/focused_menu.dart';
 import 'package:focused_menu_custom/modals.dart';
+import 'package:get/get.dart';
 import 'package:model/email/presentation_email.dart';
 import 'package:model/extensions/presentation_mailbox_extension.dart';
 import 'package:model/mailbox/presentation_mailbox.dart';
@@ -17,9 +19,7 @@ import 'package:tmail_ui_user/features/search/mailbox/presentation/utils/search_
 
 class MailboxSearchedItemBuilder extends StatefulWidget {
 
-  final PresentationMailbox _presentationMailbox;
-  final ImagePaths _imagePaths;
-  final ResponsiveUtils _responsiveUtils;
+  final PresentationMailbox presentationMailbox;
   final double? maxWidth;
   final OnClickOpenMailboxAction? onClickOpenMailboxAction;
   final OnClickOpenMenuMailboxAction? onClickOpenMenuMailboxAction;
@@ -27,27 +27,28 @@ class MailboxSearchedItemBuilder extends StatefulWidget {
   final OnLongPressMailboxAction? onLongPressMailboxAction;
   final List<FocusedMenuItem>? listPopupMenuItemAction;
 
-  const MailboxSearchedItemBuilder(
-    this._imagePaths,
-    this._responsiveUtils,
-    this._presentationMailbox,
-    {
-      Key? key,
-      this.maxWidth,
-      this.onClickOpenMailboxAction,
-      this.onClickOpenMenuMailboxAction,
-      this.onDragEmailToMailboxAccepted,
-      this.onLongPressMailboxAction,
-      this.listPopupMenuItemAction
-    }
-  ) : super(key: key);
+  const MailboxSearchedItemBuilder({
+    Key? key,
+    required this.presentationMailbox,
+    this.maxWidth,
+    this.onClickOpenMailboxAction,
+    this.onClickOpenMenuMailboxAction,
+    this.onDragEmailToMailboxAccepted,
+    this.onLongPressMailboxAction,
+    this.listPopupMenuItemAction,
+  }) : super(key: key);
 
   @override
   State<MailboxSearchedItemBuilder> createState() => _MailboxSearchedItemBuilderState();
 }
 
 class _MailboxSearchedItemBuilderState extends State<MailboxSearchedItemBuilder> {
+
+  final ImagePaths _imagePaths = Get.find<ImagePaths>();
+  final ResponsiveUtils _responsiveUtils = Get.find<ResponsiveUtils>();
+
   bool isHoverItem = false;
+  bool _popupMenuVisible = false;
 
   @override
   Widget build(BuildContext context) {
@@ -55,7 +56,7 @@ class _MailboxSearchedItemBuilderState extends State<MailboxSearchedItemBuilder>
       return DragTarget<List<PresentationEmail>>(
         builder: (_, __, ___) => _buildMailboxItem(context),
         onAcceptWithDetails: (emails) {
-          widget.onDragEmailToMailboxAccepted?.call(emails.data, widget._presentationMailbox);
+          widget.onDragEmailToMailboxAccepted?.call(emails.data, widget.presentationMailbox);
         }
       );
     } else {
@@ -76,10 +77,10 @@ class _MailboxSearchedItemBuilderState extends State<MailboxSearchedItemBuilder>
             borderRadius: BorderRadius.circular(8),
             color: getBackgroundColorItem(context)
           ),
-          padding: SearchMailboxUtils.getPaddingItemListView(context, widget._responsiveUtils),
+          padding: SearchMailboxUtils.getPaddingItemListView(context, _responsiveUtils),
           child: Row(
-            crossAxisAlignment: widget._presentationMailbox.mailboxPath?.isNotEmpty == true
-              || widget._presentationMailbox.isTeamMailboxes
+            crossAxisAlignment: widget.presentationMailbox.mailboxPath?.isNotEmpty == true
+              || widget.presentationMailbox.isTeamMailboxes
                 ? CrossAxisAlignment.start
                 : CrossAxisAlignment.center,
             children: [
@@ -101,7 +102,7 @@ class _MailboxSearchedItemBuilderState extends State<MailboxSearchedItemBuilder>
       );
     } else {
       return ResponsiveWidget(
-        responsiveUtils: widget._responsiveUtils,
+        responsiveUtils: _responsiveUtils,
         mobile: _buildMailboxItemMobile(),
         tablet: _buildMailboxItemTablet()
       );
@@ -124,10 +125,10 @@ class _MailboxSearchedItemBuilderState extends State<MailboxSearchedItemBuilder>
           onTap: _onTapMailboxAction,
           borderRadius: const BorderRadius.all(Radius.circular(8)),
           child: Padding(
-            padding: SearchMailboxUtils.getPaddingItemListView(context, widget._responsiveUtils),
+            padding: SearchMailboxUtils.getPaddingItemListView(context, _responsiveUtils),
             child: Row(
-              crossAxisAlignment: widget._presentationMailbox.mailboxPath?.isNotEmpty == true
-                || widget._presentationMailbox.isTeamMailboxes
+              crossAxisAlignment: widget.presentationMailbox.mailboxPath?.isNotEmpty == true
+                || widget.presentationMailbox.isTeamMailboxes
                   ? CrossAxisAlignment.start
                   : CrossAxisAlignment.center,
               children: [
@@ -158,10 +159,10 @@ class _MailboxSearchedItemBuilderState extends State<MailboxSearchedItemBuilder>
         onLongPress: _onLongPressMailboxAction,
         borderRadius: const BorderRadius.all(Radius.circular(8)),
         child: Padding(
-          padding: SearchMailboxUtils.getPaddingItemListView(context, widget._responsiveUtils),
+          padding: SearchMailboxUtils.getPaddingItemListView(context, _responsiveUtils),
           child: Row(
-            crossAxisAlignment: widget._presentationMailbox.mailboxPath?.isNotEmpty == true
-              || widget._presentationMailbox.isTeamMailboxes
+            crossAxisAlignment: widget.presentationMailbox.mailboxPath?.isNotEmpty == true
+              || widget.presentationMailbox.isTeamMailboxes
                 ? CrossAxisAlignment.start
                 : CrossAxisAlignment.center,
             children: [
@@ -184,22 +185,22 @@ class _MailboxSearchedItemBuilderState extends State<MailboxSearchedItemBuilder>
   }
 
   void _onTapMailboxAction() {
-    if (widget._presentationMailbox.allowedToDisplay) {
-      widget.onClickOpenMailboxAction?.call(widget._presentationMailbox);
+    if (widget.presentationMailbox.allowedToDisplay) {
+      widget.onClickOpenMailboxAction?.call(widget.presentationMailbox);
     }
   }
 
   void _onLongPressMailboxAction() {
     if (widget.listPopupMenuItemAction?.isNotEmpty == true) {
-      widget.onLongPressMailboxAction?.call(widget._presentationMailbox);
+      widget.onLongPressMailboxAction?.call(widget.presentationMailbox);
     }
   }
 
   Widget _buildMailboxIcon() {
     return SvgPicture.asset(
-      widget._presentationMailbox.allowedToDisplay
-        ? widget._presentationMailbox.getMailboxIcon(widget._imagePaths)
-        : widget._imagePaths.icHideFolder,
+      widget.presentationMailbox.allowedToDisplay
+        ? widget.presentationMailbox.getMailboxIcon(_imagePaths)
+        : _imagePaths.icHideFolder,
       width: 20,
       height: 20,
       fit: BoxFit.fill
@@ -208,7 +209,7 @@ class _MailboxSearchedItemBuilderState extends State<MailboxSearchedItemBuilder>
 
   Widget _buildTitleItem(BuildContext context) {
     return TextOverflowBuilder(
-      widget._presentationMailbox.getDisplayName(context),
+      widget.presentationMailbox.getDisplayName(context),
       style: const TextStyle(
         fontSize: 15,
         color: Colors.black
@@ -217,18 +218,18 @@ class _MailboxSearchedItemBuilderState extends State<MailboxSearchedItemBuilder>
   }
 
   Widget _buildSubtitleItem() {
-    if (widget._presentationMailbox.mailboxPath?.isNotEmpty == true) {
+    if (widget.presentationMailbox.mailboxPath?.isNotEmpty == true) {
       return TextOverflowBuilder(
-        (widget._presentationMailbox.mailboxPath ?? ''),
+        (widget.presentationMailbox.mailboxPath ?? ''),
         style: const TextStyle(
           fontSize: 11,
           color: AppColor.colorMailboxPath,
           fontWeight: FontWeight.normal
         ),
       );
-    } else if (widget._presentationMailbox.isTeamMailboxes) {
+    } else if (widget.presentationMailbox.isTeamMailboxes) {
       return TextOverflowBuilder(
-        widget._presentationMailbox.emailTeamMailBoxes,
+        widget.presentationMailbox.emailTeamMailBoxes,
         style: const TextStyle(
           fontSize: 11,
           color: AppColor.colorEmailAddressFull,
@@ -241,25 +242,29 @@ class _MailboxSearchedItemBuilderState extends State<MailboxSearchedItemBuilder>
   }
 
   Widget _buildMenuIcon(BuildContext context) {
-    if (isHoverItem && widget.listPopupMenuItemAction?.isNotEmpty == true) {
-      return InkWell(
-        onTapDown: (detail) {
-          final screenSize = MediaQuery.of(context).size;
-          final offset = detail.globalPosition;
-          final position = RelativeRect.fromLTRB(
-            offset.dx,
-            offset.dy,
-            screenSize.width - offset.dx,
-            screenSize.height - offset.dy,
-          );
-          widget.onClickOpenMenuMailboxAction?.call(position, widget._presentationMailbox);
-        },
-        child: SvgPicture.asset(
-          widget._imagePaths.icComposerMenu,
-          width: 20,
-          height: 20,
-          fit: BoxFit.fill
-        )
+    if (widget.listPopupMenuItemAction?.isNotEmpty == true) {
+      return Offstage(
+        offstage: !_shouldShowPopupMenu,
+        child: TMailButtonWidget.fromIcon(
+          icon: _imagePaths.icMoreVertical,
+          backgroundColor: _popupMenuVisible
+              ? Theme.of(context).colorScheme.outline.withOpacity(0.08)
+              : Colors.transparent,
+          iconSize: 16,
+          padding: const EdgeInsetsDirectional.all(2),
+          onTapActionAtPositionCallback: (position) {
+            if (!_responsiveUtils.isScreenWithShortestSide(context)) {
+              _onPopupMenuVisibleChange(true);
+            }
+            widget.onClickOpenMenuMailboxAction
+              ?.call(position, widget.presentationMailbox)
+              .whenComplete(() {
+                if (context.mounted && !_responsiveUtils.isScreenWithShortestSide(context)) {
+                  _onPopupMenuVisibleChange(false);
+                }
+              });
+          },
+        ),
       );
     } else {
       return const SizedBox.shrink();
@@ -270,9 +275,19 @@ class _MailboxSearchedItemBuilderState extends State<MailboxSearchedItemBuilder>
     if (isHoverItem) {
       return AppColor.colorBgMailboxSelected;
     } else {
-      return widget._responsiveUtils.isDesktop(context)
+      return _responsiveUtils.isDesktop(context)
         ? AppColor.colorBgDesktop
         : Colors.transparent;
     }
   }
+
+  bool get _shouldShowPopupMenu =>
+      (isHoverItem && widget.listPopupMenuItemAction?.isNotEmpty == true) ||
+      _popupMenuVisible;
+
+  void _onPopupMenuVisibleChange(bool visible) {
+    if (_popupMenuVisible != visible) {
+      setState(() => _popupMenuVisible = visible);
+    }
+  }
 }
\ No newline at end of file