diff --git a/src/frontend/src/features/layouts/components/mailbox-panel/index.tsx b/src/frontend/src/features/layouts/components/mailbox-panel/index.tsx
index 8dac5629..35b02bc9 100644
--- a/src/frontend/src/features/layouts/components/mailbox-panel/index.tsx
+++ b/src/frontend/src/features/layouts/components/mailbox-panel/index.tsx
@@ -6,6 +6,7 @@ import { useNavigate } from "@tanstack/react-router";
 import { useUrlSearchParams } from "@/hooks/use-url-search-params";
 import { useLayoutContext } from "@/features/layouts/components/layout-context";
 import { MailboxLabels } from "./components/mailbox-labels";
+import { MAILBOX_FOLDERS } from "./components/mailbox-list";
 import { Group, Panel, Separator, useDefaultLayout } from "react-resizable-panels";
 import { MailboxSelector } from "@/features/layouts/components/mailbox-selector";
 
@@ -31,7 +32,10 @@ export const MailboxPanel = () => {
                             selectedMailbox={selectedMailbox}
                             onSelect={(mailboxId) => {
                                 closeLeftPanel();
-                                navigate({ to: '/mailbox/$mailboxId', params: { mailboxId }, search: Object.fromEntries(searchParams) });
+                                const search = searchParams.has("search")
+                                    ? MAILBOX_FOLDERS()[0].filter
+                                    : Object.fromEntries(searchParams);
+                                navigate({ to: '/mailbox/$mailboxId', params: { mailboxId }, search });
                             }}
                         />
                     </div>