From 4c6d1e644eb91df4237a4c65f3aa39bcd97e78bd Mon Sep 17 00:00:00 2001
From: Leendert de Borst <ldeborst@xivisoft.com>
Date: Tue, 3 Feb 2026 11:54:32 +0100
Subject: [PATCH] Close filter dropdown on folder visibility toggle (#1598)

---
 .../src/entrypoints/popup/pages/items/ItemsList.tsx             | 1 +
 apps/mobile-app/app/(tabs)/items/index.tsx                      | 1 +
 apps/mobile-app/i18n/locales/en.json                            | 2 +-
 apps/server/AliasVault.Client/Main/Pages/Items/Home.razor       | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/browser-extension/src/entrypoints/popup/pages/items/ItemsList.tsx b/apps/browser-extension/src/entrypoints/popup/pages/items/ItemsList.tsx
index e8343c269..918c5e5fb 100644
--- a/apps/browser-extension/src/entrypoints/popup/pages/items/ItemsList.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/pages/items/ItemsList.tsx
@@ -621,6 +621,7 @@ const ItemsList: React.FC = () => {
                           const newValue = !showFolders;
                           setShowFolders(newValue);
                           LocalPreferencesService.setShowFolders(newValue);
+                          setShowFilterMenu(false);
                         }}
                         className="absolute right-2 top-1/2 -translate-y-1/2 flex items-center gap-1.5 px-2 py-1 text-xs text-gray-500 dark:text-gray-400 hover:text-gray-700 dark:hover:text-gray-300 rounded hover:bg-gray-200 dark:hover:bg-gray-600"
                       >
diff --git a/apps/mobile-app/app/(tabs)/items/index.tsx b/apps/mobile-app/app/(tabs)/items/index.tsx
index ee27e4906..7564ad6af 100644
--- a/apps/mobile-app/app/(tabs)/items/index.tsx
+++ b/apps/mobile-app/app/(tabs)/items/index.tsx
@@ -820,6 +820,7 @@ export default function ItemsScreen(): React.ReactNode {
                 const newValue = !showFolderItems;
                 setShowFolderItems(newValue);
                 LocalPreferencesService.setShowFolders(newValue);
+                setShowFilterMenu(false);
               }}
               hitSlop={{ top: 10, bottom: 10, left: 10, right: 10 }}
             >
diff --git a/apps/mobile-app/i18n/locales/en.json b/apps/mobile-app/i18n/locales/en.json
index 3543ff70f..56654d471 100644
--- a/apps/mobile-app/i18n/locales/en.json
+++ b/apps/mobile-app/i18n/locales/en.json
@@ -437,7 +437,7 @@
     "switchBackToBrowser": "Switch back to your browser to continue.",
     "filters": {
       "all": "Items",
-      "showFolders": "show folders",
+      "showFolders": "Folders",
       "passkeys": "Passkeys",
       "attachments": "Attachments"
     },
diff --git a/apps/server/AliasVault.Client/Main/Pages/Items/Home.razor b/apps/server/AliasVault.Client/Main/Pages/Items/Home.razor
index 4cd30d76b..5ba0473be 100644
--- a/apps/server/AliasVault.Client/Main/Pages/Items/Home.razor
+++ b/apps/server/AliasVault.Client/Main/Pages/Items/Home.razor
@@ -642,6 +642,7 @@ else
     private async Task ToggleShowFoldersAsync()
     {
         ShowFolders = !ShowFolders;
+        ShowFilterDropdown = false; // Close dropdown so user can see the change
         VisibleItemCount = BatchSize; // Reset visible items when setting changes
         await LocalStorage.SetItemAsync(ShowFoldersStorageKey, ShowFolders);
         StateHasChanged();