diff --git a/lib/features/base/widget/card_with_smart_interaction_overlay_view.dart b/lib/features/base/widget/card_with_smart_interaction_overlay_view.dart
index 02fe5a76c..ac6bb6d7a 100644
--- a/lib/features/base/widget/card_with_smart_interaction_overlay_view.dart
+++ b/lib/features/base/widget/card_with_smart_interaction_overlay_view.dart
@@ -118,6 +118,8 @@ class _CardWithSmartInteractionOverlayViewState
   }
 
   void _togglePopup() {
+    FocusManager.instance.primaryFocus?.unfocus();
+
     widget.onClearFocusAction?.call();
     
     if (_overlayEntry == null) {
diff --git a/test/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller_test.dart b/test/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller_test.dart
index 17968c5e7..9a4db5d7c 100644
--- a/test/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller_test.dart
+++ b/test/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller_test.dart
@@ -468,8 +468,8 @@ void main() {
         getLatestChanges: anyNamed('getLatestChanges'),
         propertiesCreated: anyNamed('propertiesCreated'),
         propertiesUpdated: anyNamed('propertiesUpdated')));
-      expect(searchController.sortOrderFiltered, SearchEmailFilter.defaultSortOrder);
-      expect(searchController.searchEmailFilter.value, SearchEmailFilter.initial());
+      expect(searchController.sortOrderFiltered, EmailSortOrderType.oldest);
+      expect(searchController.searchEmailFilter.value, SearchEmailFilter.withSortOrder(EmailSortOrderType.oldest));
       verify(getEmailsInMailboxInteractor.execute(
         testSession, testAccountId,
         limit: ThreadConstants.defaultLimit,