diff --git a/src/components/documents/documents-hub.tsx b/src/components/documents/documents-hub.tsx
index 54431e39..ee270e93 100644
--- a/src/components/documents/documents-hub.tsx
+++ b/src/components/documents/documents-hub.tsx
@@ -211,22 +211,27 @@ export function DocumentsHub({ portSlug, initialTab = 'all' }: DocumentsHubProps
     );
   };
 
+  const handleFolderSelect = (id: string | null | undefined) => {
+    setSelectedFolderId(id);
+    setTypeFilter(undefined);
+  };
+
   return (
     <div className="flex flex-col sm:flex-row h-full">
       <FolderTreeSidebar
         selectedFolderId={selectedFolderId}
-        onSelect={setSelectedFolderId}
+        onSelect={handleFolderSelect}
         footer={
           <PermissionGate resource="documents" action="manage_folders">
             <FolderActionsMenu
               selectedFolderId={selectedFolderId}
-              onAfterDelete={() => setSelectedFolderId(undefined)}
+              onAfterDelete={() => handleFolderSelect(undefined)}
             />
           </PermissionGate>
         }
       />
       <div className="flex-1 min-w-0 p-4 space-y-4">
-        <FolderBreadcrumb selectedFolderId={selectedFolderId} onSelect={setSelectedFolderId} />
+        <FolderBreadcrumb selectedFolderId={selectedFolderId} onSelect={handleFolderSelect} />
 
         <PageHeader
           title="Documents"
@@ -262,7 +267,13 @@ export function DocumentsHub({ portSlug, initialTab = 'all' }: DocumentsHubProps
           variant="gradient"
         />
 
-        <Tabs value={tab} onValueChange={(v) => setTab(v as DocumentsHubTab)}>
+        <Tabs
+          value={tab}
+          onValueChange={(v) => {
+            setTab(v as DocumentsHubTab);
+            setTypeFilter(undefined);
+          }}
+        >
           <TabsList>
             {documentsHubTabs.map((t) => (
               <TabsTrigger key={t} value={t}>
@@ -285,9 +296,7 @@ export function DocumentsHub({ portSlug, initialTab = 'all' }: DocumentsHubProps
             className="max-w-xs h-9"
           />
           {(() => {
-            const seenTypes = Array.from(
-              new Set(documents.map((d) => d.documentType)),
-            ).sort();
+            const seenTypes = Array.from(new Set(documents.map((d) => d.documentType))).sort();
             if (seenTypes.length === 0) return null;
             return (
               <div className="flex flex-wrap gap-1.5">
@@ -311,7 +320,7 @@ export function DocumentsHub({ portSlug, initialTab = 'all' }: DocumentsHubProps
                     )}
                     onClick={() => setTypeFilter(t)}
                   >
-                    {t}
+                    {TYPE_LABELS[t] ?? t}
                   </button>
                 ))}
               </div>