diff --git a/surfsense_web/components/layout/index.ts b/surfsense_web/components/layout/index.ts
index 18f8cc9d3..57b675088 100644
--- a/surfsense_web/components/layout/index.ts
+++ b/surfsense_web/components/layout/index.ts
@@ -4,7 +4,6 @@ export type {
 	ChatItem,
 	IconRailProps,
 	NavItem,
-	NoteItem,
 	PageUsage,
 	SearchSpace,
 	SidebarSectionProps,
@@ -21,7 +20,6 @@ export {
 	MobileSidebarTrigger,
 	NavIcon,
 	NavSection,
-	NoteListItem,
 	PageUsageDisplay,
 	SearchSpaceAvatar,
 	Sidebar,
diff --git a/surfsense_web/components/layout/providers/LayoutDataProvider.tsx b/surfsense_web/components/layout/providers/LayoutDataProvider.tsx
index 135a3d445..7b4159b13 100644
--- a/surfsense_web/components/layout/providers/LayoutDataProvider.tsx
+++ b/surfsense_web/components/layout/providers/LayoutDataProvider.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { useQuery, useQueryClient } from "@tanstack/react-query";
-import { useAtomValue, useSetAtom } from "jotai";
+import { useAtomValue } from "jotai";
 import { Logs, SquareLibrary, Trash2 } from "lucide-react";
 import { useParams, usePathname, useRouter } from "next/navigation";
 import { useTranslations } from "next-intl";
diff --git a/surfsense_web/components/layout/types/layout.types.ts b/surfsense_web/components/layout/types/layout.types.ts
index f8d06ab73..51b06daa3 100644
--- a/surfsense_web/components/layout/types/layout.types.ts
+++ b/surfsense_web/components/layout/types/layout.types.ts
@@ -31,14 +31,6 @@ export interface ChatItem {
 	isOwnThread?: boolean;
 }
 
-export interface NoteItem {
-	id: number;
-	name: string;
-	url: string;
-	isActive?: boolean;
-	isReindexing?: boolean;
-}
-
 export interface PageUsage {
 	pagesUsed: number;
 	pagesLimit: number;
@@ -74,7 +66,8 @@ export interface ChatsSectionProps {
 	activeChatId?: number | null;
 	onChatSelect: (chat: ChatItem) => void;
 	onChatDelete?: (chat: ChatItem) => void;
-	onViewAllChats?: () => void;
+	onViewAllSharedChats?: () => void;
+	onViewAllPrivateChats?: () => void;
 	searchSpaceId?: string;
 }
 
@@ -104,7 +97,8 @@ export interface SidebarProps {
 	onNewChat: () => void;
 	onChatSelect: (chat: ChatItem) => void;
 	onChatDelete?: (chat: ChatItem) => void;
-	onViewAllChats?: () => void;
+	onViewAllSharedChats?: () => void;
+	onViewAllPrivateChats?: () => void;
 	user: User;
 	theme?: string;
 	onSettings?: () => void;
diff --git a/surfsense_web/components/layout/ui/index.ts b/surfsense_web/components/layout/ui/index.ts
index bd3d54838..875e3b746 100644
--- a/surfsense_web/components/layout/ui/index.ts
+++ b/surfsense_web/components/layout/ui/index.ts
@@ -8,7 +8,6 @@ export {
 	MobileSidebar,
 	MobileSidebarTrigger,
 	NavSection,
-	NoteListItem,
 	PageUsageDisplay,
 	Sidebar,
 	SidebarCollapseButton,
diff --git a/surfsense_web/components/layout/ui/sidebar/AllChatsSidebar.tsx b/surfsense_web/components/layout/ui/sidebar/AllChatsSidebar.tsx
deleted file mode 100644
index 4b85808e5..000000000
--- a/surfsense_web/components/layout/ui/sidebar/AllChatsSidebar.tsx
+++ /dev/null
@@ -1,488 +0,0 @@
-"use client";
-
-import { useQuery, useQueryClient } from "@tanstack/react-query";
-import { format } from "date-fns";
-import {
-	ArchiveIcon,
-	Globe,
-	Loader2,
-	Lock,
-	MessageCircleMore,
-	MoreHorizontal,
-	RotateCcwIcon,
-	Search,
-	Trash2,
-	Users,
-	X,
-} from "lucide-react";
-import { AnimatePresence, motion } from "motion/react";
-import { useParams, useRouter } from "next/navigation";
-import { useTranslations } from "next-intl";
-import { useCallback, useEffect, useMemo, useState } from "react";
-import { createPortal } from "react-dom";
-import { toast } from "sonner";
-import { Button } from "@/components/ui/button";
-import {
-	DropdownMenu,
-	DropdownMenuContent,
-	DropdownMenuItem,
-	DropdownMenuSeparator,
-	DropdownMenuTrigger,
-} from "@/components/ui/dropdown-menu";
-import { Input } from "@/components/ui/input";
-import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
-import { useDebouncedValue } from "@/hooks/use-debounced-value";
-import {
-	deleteThread,
-	fetchThreads,
-	searchThreads,
-	type ThreadListItem,
-	updateThread,
-} from "@/lib/chat/thread-persistence";
-import { cn } from "@/lib/utils";
-
-type TabType = "shared" | "private";
-
-interface AllChatsSidebarProps {
-	open: boolean;
-	onOpenChange: (open: boolean) => void;
-	searchSpaceId: string;
-	onCloseMobileSidebar?: () => void;
-}
-
-export function AllChatsSidebar({
-	open,
-	onOpenChange,
-	searchSpaceId,
-	onCloseMobileSidebar,
-}: AllChatsSidebarProps) {
-	const t = useTranslations("sidebar");
-	const router = useRouter();
-	const params = useParams();
-	const queryClient = useQueryClient();
-
-	// Get the current chat ID from URL to check if user is deleting the currently open chat
-	const currentChatId = Array.isArray(params.chat_id)
-		? Number(params.chat_id[0])
-		: params.chat_id
-			? Number(params.chat_id)
-			: null;
-	const [deletingThreadId, setDeletingThreadId] = useState<number | null>(null);
-	const [archivingThreadId, setArchivingThreadId] = useState<number | null>(null);
-	const [searchQuery, setSearchQuery] = useState("");
-	const [activeTab, setActiveTab] = useState<TabType>("shared");
-	const [mounted, setMounted] = useState(false);
-	const [openDropdownId, setOpenDropdownId] = useState<number | null>(null);
-	const debouncedSearchQuery = useDebouncedValue(searchQuery, 300);
-
-	const isSearchMode = !!debouncedSearchQuery.trim();
-
-	// Handle mounting for portal
-	useEffect(() => {
-		setMounted(true);
-	}, []);
-
-	// Handle escape key
-	useEffect(() => {
-		const handleEscape = (e: KeyboardEvent) => {
-			if (e.key === "Escape" && open) {
-				onOpenChange(false);
-			}
-		};
-		document.addEventListener("keydown", handleEscape);
-		return () => document.removeEventListener("keydown", handleEscape);
-	}, [open, onOpenChange]);
-
-	// Lock body scroll when open
-	useEffect(() => {
-		if (open) {
-			document.body.style.overflow = "hidden";
-		} else {
-			document.body.style.overflow = "";
-		}
-		return () => {
-			document.body.style.overflow = "";
-		};
-	}, [open]);
-
-	// Fetch all threads (when not searching)
-	const {
-		data: threadsData,
-		error: threadsError,
-		isLoading: isLoadingThreads,
-	} = useQuery({
-		queryKey: ["all-threads", searchSpaceId],
-		queryFn: () => fetchThreads(Number(searchSpaceId)),
-		enabled: !!searchSpaceId && open && !isSearchMode,
-	});
-
-	// Search threads (when searching)
-	const {
-		data: searchData,
-		error: searchError,
-		isLoading: isLoadingSearch,
-	} = useQuery({
-		queryKey: ["search-threads", searchSpaceId, debouncedSearchQuery],
-		queryFn: () => searchThreads(Number(searchSpaceId), debouncedSearchQuery.trim()),
-		enabled: !!searchSpaceId && open && isSearchMode,
-	});
-
-	// Split threads into shared and private based on visibility
-	const { sharedChats, privateChats } = useMemo(() => {
-		let allThreads: ThreadListItem[] = [];
-
-		if (isSearchMode) {
-			allThreads = searchData ?? [];
-		} else if (threadsData) {
-			// Combine active and archived threads for filtering
-			allThreads = [...threadsData.threads, ...threadsData.archived_threads];
-		}
-
-		const shared: ThreadListItem[] = [];
-		const privateChatsList: ThreadListItem[] = [];
-
-		for (const thread of allThreads) {
-			if (thread.visibility === "SEARCH_SPACE") {
-				shared.push(thread);
-			} else {
-				privateChatsList.push(thread);
-			}
-		}
-
-		return { sharedChats: shared, privateChats: privateChatsList };
-	}, [threadsData, searchData, isSearchMode]);
-
-	// Get threads for current tab
-	const threads = activeTab === "shared" ? sharedChats : privateChats;
-
-	// Handle thread navigation
-	const handleThreadClick = useCallback(
-		(threadId: number) => {
-			router.push(`/dashboard/${searchSpaceId}/new-chat/${threadId}`);
-			onOpenChange(false);
-			// Also close the main sidebar on mobile
-			onCloseMobileSidebar?.();
-		},
-		[router, onOpenChange, searchSpaceId, onCloseMobileSidebar]
-	);
-
-	// Handle thread deletion
-	const handleDeleteThread = useCallback(
-		async (threadId: number) => {
-			setDeletingThreadId(threadId);
-			try {
-				await deleteThread(threadId);
-				toast.success(t("chat_deleted") || "Chat deleted successfully");
-				queryClient.invalidateQueries({ queryKey: ["all-threads", searchSpaceId] });
-				queryClient.invalidateQueries({ queryKey: ["search-threads", searchSpaceId] });
-				queryClient.invalidateQueries({ queryKey: ["threads", searchSpaceId] });
-
-				// If the deleted chat is currently open, close sidebar first then redirect
-				if (currentChatId === threadId) {
-					onOpenChange(false);
-					// Wait for sidebar close animation to complete before navigating
-					setTimeout(() => {
-						router.push(`/dashboard/${searchSpaceId}/new-chat`);
-					}, 250);
-				}
-			} catch (error) {
-				console.error("Error deleting thread:", error);
-				toast.error(t("error_deleting_chat") || "Failed to delete chat");
-			} finally {
-				setDeletingThreadId(null);
-			}
-		},
-		[queryClient, searchSpaceId, t, currentChatId, router, onOpenChange]
-	);
-
-	// Handle thread archive/unarchive
-	const handleToggleArchive = useCallback(
-		async (threadId: number, currentlyArchived: boolean) => {
-			setArchivingThreadId(threadId);
-			try {
-				await updateThread(threadId, { archived: !currentlyArchived });
-				toast.success(
-					currentlyArchived
-						? t("chat_unarchived") || "Chat restored"
-						: t("chat_archived") || "Chat archived"
-				);
-				queryClient.invalidateQueries({ queryKey: ["all-threads", searchSpaceId] });
-				queryClient.invalidateQueries({ queryKey: ["search-threads", searchSpaceId] });
-				queryClient.invalidateQueries({ queryKey: ["threads", searchSpaceId] });
-			} catch (error) {
-				console.error("Error archiving thread:", error);
-				toast.error(t("error_archiving_chat") || "Failed to archive chat");
-			} finally {
-				setArchivingThreadId(null);
-			}
-		},
-		[queryClient, searchSpaceId, t]
-	);
-
-	// Clear search
-	const handleClearSearch = useCallback(() => {
-		setSearchQuery("");
-	}, []);
-
-	const isLoading = isSearchMode ? isLoadingSearch : isLoadingThreads;
-	const error = isSearchMode ? searchError : threadsError;
-
-	// Get counts for tabs
-	const sharedCount = sharedChats.length;
-	const privateCount = privateChats.length;
-
-	if (!mounted) return null;
-
-	return createPortal(
-		<AnimatePresence>
-			{open && (
-				<>
-					{/* Backdrop */}
-					<motion.div
-						initial={{ opacity: 0 }}
-						animate={{ opacity: 1 }}
-						exit={{ opacity: 0 }}
-						transition={{ duration: 0.2 }}
-						className="fixed inset-0 z-70 bg-black/50"
-						onClick={() => onOpenChange(false)}
-						aria-hidden="true"
-					/>
-
-					{/* Panel */}
-					<motion.div
-						initial={{ x: "-100%" }}
-						animate={{ x: 0 }}
-						exit={{ x: "-100%" }}
-						transition={{ type: "spring", damping: 25, stiffness: 300 }}
-						className="fixed inset-y-0 left-0 z-70 w-80 bg-background shadow-xl flex flex-col pointer-events-auto isolate"
-						role="dialog"
-						aria-modal="true"
-						aria-label={t("all_chats") || "All Chats"}
-					>
-						{/* Header */}
-						<div className="shrink-0 p-4 pb-2 space-y-3">
-							<div className="flex items-center justify-between">
-								<h2 className="text-lg font-semibold">{t("all_chats") || "All Chats"}</h2>
-								<Button
-									variant="ghost"
-									size="icon"
-									className="h-8 w-8 rounded-full"
-									onClick={() => onOpenChange(false)}
-								>
-									<X className="h-4 w-4" />
-									<span className="sr-only">Close</span>
-								</Button>
-							</div>
-
-							{/* Search Input */}
-							<div className="relative">
-								<Search className="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground" />
-								<Input
-									type="text"
-									placeholder={t("search_chats") || "Search chats..."}
-									value={searchQuery}
-									onChange={(e) => setSearchQuery(e.target.value)}
-									className="pl-9 pr-8 h-9"
-								/>
-								{searchQuery && (
-									<Button
-										variant="ghost"
-										size="icon"
-										className="absolute right-1 top-1/2 -translate-y-1/2 h-6 w-6"
-										onClick={handleClearSearch}
-									>
-										<X className="h-3.5 w-3.5" />
-										<span className="sr-only">{t("clear_search") || "Clear search"}</span>
-									</Button>
-								)}
-							</div>
-						</div>
-
-						{/* Tab toggle for shared/private chats */}
-						<div className="shrink-0 flex border-b mx-4">
-							<button
-								type="button"
-								onClick={() => setActiveTab("shared")}
-								className={cn(
-									"flex-1 px-3 py-2 text-center text-xs font-medium transition-colors flex items-center justify-center gap-1.5",
-									activeTab === "shared"
-										? "border-b-2 border-primary text-primary"
-										: "text-muted-foreground hover:text-foreground"
-								)}
-							>
-								<Users className="h-3.5 w-3.5" />
-								{t("shared_chats") || "Shared"} ({sharedCount})
-							</button>
-							<button
-								type="button"
-								onClick={() => setActiveTab("private")}
-								className={cn(
-									"flex-1 px-3 py-2 text-center text-xs font-medium transition-colors flex items-center justify-center gap-1.5",
-									activeTab === "private"
-										? "border-b-2 border-primary text-primary"
-										: "text-muted-foreground hover:text-foreground"
-								)}
-							>
-								<Lock className="h-3.5 w-3.5" />
-								{t("chats") || "Private"} ({privateCount})
-							</button>
-						</div>
-
-						{/* Scrollable Content */}
-						<div className="flex-1 overflow-y-auto overflow-x-hidden p-2">
-							{isLoading ? (
-								<div className="flex items-center justify-center py-8">
-									<Loader2 className="h-6 w-6 animate-spin text-muted-foreground" />
-								</div>
-							) : error ? (
-								<div className="text-center py-8 text-sm text-destructive">
-									{t("error_loading_chats") || "Error loading chats"}
-								</div>
-							) : threads.length > 0 ? (
-								<div className="space-y-1">
-									{threads.map((thread) => {
-										const isDeleting = deletingThreadId === thread.id;
-										const isArchiving = archivingThreadId === thread.id;
-										const isBusy = isDeleting || isArchiving;
-										const isActive = currentChatId === thread.id;
-										const isShared = thread.visibility === "SEARCH_SPACE";
-
-										return (
-											<div
-												key={thread.id}
-												className={cn(
-													"group flex items-center gap-2 rounded-md px-2 py-1.5 text-sm",
-													"hover:bg-accent hover:text-accent-foreground",
-													"transition-colors cursor-pointer",
-													isActive && "bg-accent text-accent-foreground",
-													isBusy && "opacity-50 pointer-events-none",
-													thread.archived && "opacity-60"
-												)}
-											>
-												{/* Main clickable area for navigation */}
-												<Tooltip>
-													<TooltipTrigger asChild>
-														<button
-															type="button"
-															onClick={() => handleThreadClick(thread.id)}
-															disabled={isBusy}
-															className="flex items-center gap-2 flex-1 min-w-0 text-left overflow-hidden"
-														>
-															<MessageCircleMore className="h-4 w-4 shrink-0 text-muted-foreground" />
-															<span className="truncate">{thread.title || "New Chat"}</span>
-															{thread.archived && (
-																<ArchiveIcon className="h-3 w-3 shrink-0 text-muted-foreground" />
-															)}
-														</button>
-													</TooltipTrigger>
-													<TooltipContent side="bottom" align="start">
-														<div className="space-y-1">
-															<p>
-																{t("updated") || "Updated"}:{" "}
-																{format(new Date(thread.updatedAt), "MMM d, yyyy 'at' h:mm a")}
-															</p>
-															{thread.archived && (
-																<p className="text-muted-foreground text-xs">Archived</p>
-															)}
-														</div>
-													</TooltipContent>
-												</Tooltip>
-
-												{/* Actions dropdown */}
-												<DropdownMenu
-													open={openDropdownId === thread.id}
-													onOpenChange={(isOpen) => setOpenDropdownId(isOpen ? thread.id : null)}
-												>
-													<DropdownMenuTrigger asChild>
-														<Button
-															variant="ghost"
-															size="icon"
-															className={cn(
-																"h-6 w-6 shrink-0",
-																"md:opacity-0 md:group-hover:opacity-100 md:focus:opacity-100",
-																"transition-opacity"
-															)}
-															disabled={isBusy}
-														>
-															{isDeleting ? (
-																<Loader2 className="h-3.5 w-3.5 animate-spin" />
-															) : (
-																<MoreHorizontal className="h-3.5 w-3.5" />
-															)}
-															<span className="sr-only">{t("more_options") || "More options"}</span>
-														</Button>
-													</DropdownMenuTrigger>
-													<DropdownMenuContent align="end" className="w-40 z-80">
-														<DropdownMenuItem
-															onClick={() => handleToggleArchive(thread.id, thread.archived)}
-															disabled={isArchiving}
-														>
-															{thread.archived ? (
-																<>
-																	<RotateCcwIcon className="mr-2 h-4 w-4" />
-																	<span>{t("unarchive") || "Restore"}</span>
-																</>
-															) : (
-																<>
-																	<ArchiveIcon className="mr-2 h-4 w-4" />
-																	<span>{t("archive") || "Archive"}</span>
-																</>
-															)}
-														</DropdownMenuItem>
-														<DropdownMenuSeparator />
-														<DropdownMenuItem
-															onClick={() => handleDeleteThread(thread.id)}
-															className="text-destructive focus:text-destructive"
-														>
-															<Trash2 className="mr-2 h-4 w-4" />
-															<span>{t("delete") || "Delete"}</span>
-														</DropdownMenuItem>
-													</DropdownMenuContent>
-												</DropdownMenu>
-											</div>
-										);
-									})}
-								</div>
-							) : isSearchMode ? (
-								<div className="text-center py-8">
-									<Search className="h-12 w-12 mx-auto text-muted-foreground/50 mb-3" />
-									<p className="text-sm text-muted-foreground">
-										{t("no_chats_found") || "No chats found"}
-									</p>
-									<p className="text-xs text-muted-foreground/70 mt-1">
-										{t("try_different_search") || "Try a different search term"}
-									</p>
-								</div>
-							) : (
-								<div className="text-center py-8">
-									{activeTab === "shared" ? (
-										<>
-											<Users className="h-12 w-12 mx-auto text-muted-foreground/50 mb-3" />
-											<p className="text-sm text-muted-foreground">
-												{t("no_shared_chats") || "No shared chats"}
-											</p>
-											<p className="text-xs text-muted-foreground/70 mt-1">
-												Share a chat to collaborate with your team
-											</p>
-										</>
-									) : (
-										<>
-											<Lock className="h-12 w-12 mx-auto text-muted-foreground/50 mb-3" />
-											<p className="text-sm text-muted-foreground">
-												{t("no_chats") || "No private chats"}
-											</p>
-											<p className="text-xs text-muted-foreground/70 mt-1">
-												{t("start_new_chat_hint") || "Start a new chat from the chat page"}
-											</p>
-										</>
-									)}
-								</div>
-							)}
-						</div>
-					</motion.div>
-				</>
-			)}
-		</AnimatePresence>,
-		document.body
-	);
-}
diff --git a/surfsense_web/components/layout/ui/sidebar/AllNotesSidebar.tsx b/surfsense_web/components/layout/ui/sidebar/AllNotesSidebar.tsx
deleted file mode 100644
index 67d1b4ba6..000000000
--- a/surfsense_web/components/layout/ui/sidebar/AllNotesSidebar.tsx
+++ /dev/null
@@ -1,407 +0,0 @@
-"use client";
-
-import { useQuery, useQueryClient } from "@tanstack/react-query";
-import { format } from "date-fns";
-import { FileText, Loader2, MoreHorizontal, Plus, Search, Trash2, X } from "lucide-react";
-import { AnimatePresence, motion } from "motion/react";
-import { useParams, useRouter } from "next/navigation";
-import { useTranslations } from "next-intl";
-import { useCallback, useEffect, useMemo, useState } from "react";
-import { createPortal } from "react-dom";
-import { Button } from "@/components/ui/button";
-import {
-	DropdownMenu,
-	DropdownMenuContent,
-	DropdownMenuItem,
-	DropdownMenuTrigger,
-} from "@/components/ui/dropdown-menu";
-import { Input } from "@/components/ui/input";
-import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
-import { useDebouncedValue } from "@/hooks/use-debounced-value";
-import { documentsApiService } from "@/lib/apis/documents-api.service";
-import { notesApiService } from "@/lib/apis/notes-api.service";
-import { cn } from "@/lib/utils";
-
-interface AllNotesSidebarProps {
-	open: boolean;
-	onOpenChange: (open: boolean) => void;
-	searchSpaceId: string;
-	onAddNote?: () => void;
-	onCloseMobileSidebar?: () => void;
-}
-
-export function AllNotesSidebar({
-	open,
-	onOpenChange,
-	searchSpaceId,
-	onAddNote,
-	onCloseMobileSidebar,
-}: AllNotesSidebarProps) {
-	const t = useTranslations("sidebar");
-	const router = useRouter();
-	const params = useParams();
-	const queryClient = useQueryClient();
-
-	// Get the current note ID from URL to highlight the open note
-	const currentNoteId = params.note_id ? Number(params.note_id) : null;
-	const [deletingNoteId, setDeletingNoteId] = useState<number | null>(null);
-	const [searchQuery, setSearchQuery] = useState("");
-	const [mounted, setMounted] = useState(false);
-	const [openDropdownId, setOpenDropdownId] = useState<number | null>(null);
-	const debouncedSearchQuery = useDebouncedValue(searchQuery, 300);
-
-	// Handle mounting for portal
-	useEffect(() => {
-		setMounted(true);
-	}, []);
-
-	// Handle escape key
-	useEffect(() => {
-		const handleEscape = (e: KeyboardEvent) => {
-			if (e.key === "Escape" && open) {
-				onOpenChange(false);
-			}
-		};
-		document.addEventListener("keydown", handleEscape);
-		return () => document.removeEventListener("keydown", handleEscape);
-	}, [open, onOpenChange]);
-
-	// Lock body scroll when open
-	useEffect(() => {
-		if (open) {
-			document.body.style.overflow = "hidden";
-		} else {
-			document.body.style.overflow = "";
-		}
-		return () => {
-			document.body.style.overflow = "";
-		};
-	}, [open]);
-
-	// Fetch all notes (when no search query)
-	const {
-		data: notesData,
-		error: notesError,
-		isLoading: isLoadingNotes,
-	} = useQuery({
-		queryKey: ["all-notes", searchSpaceId],
-		queryFn: () =>
-			notesApiService.getNotes({
-				search_space_id: Number(searchSpaceId),
-				page_size: 1000,
-			}),
-		enabled: !!searchSpaceId && open && !debouncedSearchQuery,
-	});
-
-	// Search notes (when there's a search query)
-	const {
-		data: searchData,
-		error: searchError,
-		isLoading: isSearching,
-	} = useQuery({
-		queryKey: ["search-notes", searchSpaceId, debouncedSearchQuery],
-		queryFn: () =>
-			documentsApiService.searchDocuments({
-				queryParams: {
-					search_space_id: Number(searchSpaceId),
-					document_types: ["NOTE"],
-					title: debouncedSearchQuery,
-					page_size: 100,
-				},
-			}),
-		enabled: !!searchSpaceId && open && !!debouncedSearchQuery,
-	});
-
-	// Handle note navigation
-	const handleNoteClick = useCallback(
-		(noteId: number, noteSearchSpaceId: number) => {
-			router.push(`/dashboard/${noteSearchSpaceId}/editor/${noteId}`);
-			onOpenChange(false);
-			// Also close the main sidebar on mobile
-			onCloseMobileSidebar?.();
-		},
-		[router, onOpenChange, onCloseMobileSidebar]
-	);
-
-	// Handle note deletion
-	const handleDeleteNote = useCallback(
-		async (noteId: number, noteSearchSpaceId: number) => {
-			setDeletingNoteId(noteId);
-			try {
-				await notesApiService.deleteNote({
-					search_space_id: noteSearchSpaceId,
-					note_id: noteId,
-				});
-				queryClient.invalidateQueries({ queryKey: ["all-notes", searchSpaceId] });
-				queryClient.invalidateQueries({ queryKey: ["notes", searchSpaceId] });
-				queryClient.invalidateQueries({ queryKey: ["search-notes", searchSpaceId] });
-			} catch (error) {
-				console.error("Error deleting note:", error);
-			} finally {
-				setDeletingNoteId(null);
-			}
-		},
-		[queryClient, searchSpaceId]
-	);
-
-	// Clear search
-	const handleClearSearch = useCallback(() => {
-		setSearchQuery("");
-	}, []);
-
-	// Determine which data to show
-	const isSearchMode = !!debouncedSearchQuery;
-	const isLoading = isSearchMode ? isSearching : isLoadingNotes;
-	const error = isSearchMode ? searchError : notesError;
-
-	// Transform and sort notes data - handle both regular notes and search results
-	const notes = useMemo(() => {
-		let notesList: {
-			id: number;
-			title: string;
-			search_space_id: number;
-			created_at: string;
-			updated_at?: string | null;
-		}[];
-
-		if (isSearchMode && searchData?.items) {
-			notesList = searchData.items.map((doc) => ({
-				id: doc.id,
-				title: doc.title,
-				search_space_id: doc.search_space_id,
-				created_at: doc.created_at,
-				updated_at: doc.updated_at,
-			}));
-		} else {
-			notesList = notesData?.items ?? [];
-		}
-
-		// Sort notes by updated_at (most recent first), fallback to created_at
-		return [...notesList].sort((a, b) => {
-			const dateA = a.updated_at
-				? new Date(a.updated_at).getTime()
-				: new Date(a.created_at).getTime();
-			const dateB = b.updated_at
-				? new Date(b.updated_at).getTime()
-				: new Date(b.created_at).getTime();
-			return dateB - dateA; // Descending order (most recent first)
-		});
-	}, [isSearchMode, searchData, notesData]);
-
-	if (!mounted) return null;
-
-	return createPortal(
-		<AnimatePresence>
-			{open && (
-				<>
-					{/* Backdrop */}
-					<motion.div
-						initial={{ opacity: 0 }}
-						animate={{ opacity: 1 }}
-						exit={{ opacity: 0 }}
-						transition={{ duration: 0.2 }}
-						className="fixed inset-0 z-[70] bg-black/50"
-						onClick={() => onOpenChange(false)}
-						aria-hidden="true"
-					/>
-
-					{/* Panel */}
-					<motion.div
-						initial={{ x: "-100%" }}
-						animate={{ x: 0 }}
-						exit={{ x: "-100%" }}
-						transition={{ type: "spring", damping: 25, stiffness: 300 }}
-						className="fixed inset-y-0 left-0 z-[70] w-80 bg-background shadow-xl flex flex-col pointer-events-auto isolate"
-						role="dialog"
-						aria-modal="true"
-						aria-label={t("all_notes") || "All Notes"}
-					>
-						{/* Header */}
-						<div className="flex-shrink-0 p-4 pb-3 space-y-3">
-							<div className="flex items-center justify-between">
-								<h2 className="text-lg font-semibold">{t("all_notes") || "All Notes"}</h2>
-								<Button
-									variant="ghost"
-									size="icon"
-									className="h-8 w-8 rounded-full"
-									onClick={() => onOpenChange(false)}
-								>
-									<X className="h-4 w-4" />
-									<span className="sr-only">Close</span>
-								</Button>
-							</div>
-
-							{/* Search Input */}
-							<div className="relative">
-								<Search className="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground" />
-								<Input
-									type="text"
-									placeholder={t("search_notes") || "Search notes..."}
-									value={searchQuery}
-									onChange={(e) => setSearchQuery(e.target.value)}
-									className="pl-9 pr-8 h-9"
-								/>
-								{searchQuery && (
-									<Button
-										variant="ghost"
-										size="icon"
-										className="absolute right-1 top-1/2 -translate-y-1/2 h-6 w-6"
-										onClick={handleClearSearch}
-									>
-										<X className="h-3.5 w-3.5" />
-										<span className="sr-only">{t("clear_search") || "Clear search"}</span>
-									</Button>
-								)}
-							</div>
-						</div>
-
-						{/* Scrollable Content */}
-						<div className="flex-1 overflow-y-auto overflow-x-hidden p-2">
-							{isLoading ? (
-								<div className="flex items-center justify-center py-8">
-									<Loader2 className="h-6 w-6 animate-spin text-muted-foreground" />
-								</div>
-							) : error ? (
-								<div className="text-center py-8 text-sm text-destructive">
-									{t("error_loading_notes") || "Error loading notes"}
-								</div>
-							) : notes.length > 0 ? (
-								<div className="space-y-1">
-									{notes.map((note) => {
-										const isDeleting = deletingNoteId === note.id;
-										const isActive = currentNoteId === note.id;
-
-										return (
-											<div
-												key={note.id}
-												className={cn(
-													"group flex items-center gap-2 rounded-md px-2 py-1.5 text-sm",
-													"hover:bg-accent hover:text-accent-foreground",
-													"transition-colors cursor-pointer",
-													isActive && "bg-accent text-accent-foreground",
-													isDeleting && "opacity-50 pointer-events-none"
-												)}
-											>
-												{/* Main clickable area for navigation */}
-												<Tooltip>
-													<TooltipTrigger asChild>
-														<button
-															type="button"
-															onClick={() => handleNoteClick(note.id, note.search_space_id)}
-															disabled={isDeleting}
-															className="flex items-center gap-2 flex-1 min-w-0 text-left overflow-hidden"
-														>
-															<FileText className="h-4 w-4 shrink-0 text-muted-foreground" />
-															<span className="truncate">{note.title}</span>
-														</button>
-													</TooltipTrigger>
-													<TooltipContent side="bottom" align="start">
-														<div className="space-y-1">
-															<p>
-																{t("created") || "Created"}:{" "}
-																{format(new Date(note.created_at), "MMM d, yyyy 'at' h:mm a")}
-															</p>
-															{note.updated_at && (
-																<p>
-																	{t("updated") || "Updated"}:{" "}
-																	{format(new Date(note.updated_at), "MMM d, yyyy 'at' h:mm a")}
-																</p>
-															)}
-														</div>
-													</TooltipContent>
-												</Tooltip>
-
-												{/* Actions dropdown - separate from main click area */}
-												<DropdownMenu
-													open={openDropdownId === note.id}
-													onOpenChange={(isOpen) => setOpenDropdownId(isOpen ? note.id : null)}
-												>
-													<DropdownMenuTrigger asChild>
-														<Button
-															variant="ghost"
-															size="icon"
-															className={cn(
-																"h-6 w-6 shrink-0",
-																"md:opacity-0 md:group-hover:opacity-100 md:focus:opacity-100",
-																"transition-opacity"
-															)}
-															disabled={isDeleting}
-														>
-															{isDeleting ? (
-																<Loader2 className="h-3.5 w-3.5 animate-spin" />
-															) : (
-																<MoreHorizontal className="h-3.5 w-3.5" />
-															)}
-															<span className="sr-only">{t("more_options") || "More options"}</span>
-														</Button>
-													</DropdownMenuTrigger>
-													<DropdownMenuContent align="end" className="w-40 z-[80]">
-														<DropdownMenuItem
-															onClick={() => handleDeleteNote(note.id, note.search_space_id)}
-															className="text-destructive focus:text-destructive"
-														>
-															<Trash2 className="mr-2 h-4 w-4" />
-															<span>{t("delete") || "Delete"}</span>
-														</DropdownMenuItem>
-													</DropdownMenuContent>
-												</DropdownMenu>
-											</div>
-										);
-									})}
-								</div>
-							) : isSearchMode ? (
-								<div className="text-center py-8">
-									<Search className="h-12 w-12 mx-auto text-muted-foreground/50 mb-3" />
-									<p className="text-sm text-muted-foreground">
-										{t("no_results_found") || "No notes found"}
-									</p>
-									<p className="text-xs text-muted-foreground/70 mt-1">
-										{t("try_different_search") || "Try a different search term"}
-									</p>
-								</div>
-							) : (
-								<div className="text-center py-8">
-									<FileText className="h-12 w-12 mx-auto text-muted-foreground/50 mb-3" />
-									<p className="text-sm text-muted-foreground mb-4">
-										{t("no_notes") || "No notes yet"}
-									</p>
-									{onAddNote && (
-										<Button
-											variant="outline"
-											size="sm"
-											onClick={() => {
-												onAddNote();
-												onOpenChange(false);
-											}}
-										>
-											<Plus className="mr-2 h-4 w-4" />
-											{t("create_new_note") || "Create a note"}
-										</Button>
-									)}
-								</div>
-							)}
-						</div>
-
-						{/* Footer with Add Note button */}
-						{onAddNote && notes.length > 0 && (
-							<div className="flex-shrink-0 p-3">
-								<Button
-									onClick={() => {
-										onAddNote();
-										onOpenChange(false);
-									}}
-									className="w-full"
-									size="sm"
-								>
-									<Plus className="mr-2 h-4 w-4" />
-									{t("create_new_note") || "Create a new note"}
-								</Button>
-							</div>
-						)}
-					</motion.div>
-				</>
-			)}
-		</AnimatePresence>,
-		document.body
-	);
-}
diff --git a/surfsense_web/components/layout/ui/sidebar/NoteListItem.tsx b/surfsense_web/components/layout/ui/sidebar/NoteListItem.tsx
deleted file mode 100644
index 0491ebcca..000000000
--- a/surfsense_web/components/layout/ui/sidebar/NoteListItem.tsx
+++ /dev/null
@@ -1,76 +0,0 @@
-"use client";
-
-import { FileText, Loader2, MoreHorizontal } from "lucide-react";
-import { useTranslations } from "next-intl";
-import { Button } from "@/components/ui/button";
-import {
-	DropdownMenu,
-	DropdownMenuContent,
-	DropdownMenuItem,
-	DropdownMenuTrigger,
-} from "@/components/ui/dropdown-menu";
-import { cn } from "@/lib/utils";
-
-interface NoteListItemProps {
-	name: string;
-	isActive?: boolean;
-	isReindexing?: boolean;
-	onClick?: () => void;
-	onDelete?: () => void;
-}
-
-export function NoteListItem({
-	name,
-	isActive,
-	isReindexing,
-	onClick,
-	onDelete,
-}: NoteListItemProps) {
-	const t = useTranslations("sidebar");
-
-	return (
-		<div className="group/item relative">
-			<button
-				type="button"
-				onClick={onClick}
-				className={cn(
-					"flex w-full items-center gap-2 overflow-hidden rounded-md p-2 text-sm text-left transition-colors",
-					"[&>span:last-child]:truncate",
-					"hover:bg-accent hover:text-accent-foreground",
-					"focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring",
-					isActive && "bg-accent text-accent-foreground"
-				)}
-			>
-				{isReindexing ? (
-					<Loader2 className="h-4 w-4 shrink-0 animate-spin text-primary" />
-				) : (
-					<FileText className="h-4 w-4 shrink-0 text-muted-foreground" />
-				)}
-				<span>{name}</span>
-			</button>
-
-			{/* Actions dropdown */}
-			<div className="absolute right-1 top-1/2 -translate-y-1/2 opacity-0 group-hover/item:opacity-100 transition-opacity">
-				<DropdownMenu>
-					<DropdownMenuTrigger asChild>
-						<Button variant="ghost" size="icon" className="h-6 w-6">
-							<MoreHorizontal className="h-3.5 w-3.5" />
-							<span className="sr-only">{t("more_options")}</span>
-						</Button>
-					</DropdownMenuTrigger>
-					<DropdownMenuContent align="end" side="right">
-						<DropdownMenuItem
-							onClick={(e) => {
-								e.stopPropagation();
-								onDelete?.();
-							}}
-							className="text-destructive focus:text-destructive"
-						>
-							{t("delete")}
-						</DropdownMenuItem>
-					</DropdownMenuContent>
-				</DropdownMenu>
-			</div>
-		</div>
-	);
-}
diff --git a/surfsense_web/components/layout/ui/sidebar/index.ts b/surfsense_web/components/layout/ui/sidebar/index.ts
index 89d542629..282e4740b 100644
--- a/surfsense_web/components/layout/ui/sidebar/index.ts
+++ b/surfsense_web/components/layout/ui/sidebar/index.ts
@@ -1,10 +1,8 @@
-export { AllChatsSidebar } from "./AllChatsSidebar";
 export { AllPrivateChatsSidebar } from "./AllPrivateChatsSidebar";
 export { AllSharedChatsSidebar } from "./AllSharedChatsSidebar";
 export { ChatListItem } from "./ChatListItem";
 export { MobileSidebar, MobileSidebarTrigger } from "./MobileSidebar";
 export { NavSection } from "./NavSection";
-export { NoteListItem } from "./NoteListItem";
 export { PageUsageDisplay } from "./PageUsageDisplay";
 export { Sidebar } from "./Sidebar";
 export { SidebarCollapseButton } from "./SidebarCollapseButton";
diff --git a/surfsense_web/messages/en.json b/surfsense_web/messages/en.json
index f46535ba7..ebc56acca 100644
--- a/surfsense_web/messages/en.json
+++ b/surfsense_web/messages/en.json
@@ -631,40 +631,21 @@
 	"sidebar": {
 		"chats": "Private Chats",
 		"shared_chats": "Shared Chats",
-		"recent_chats": "Recent Chats",
 		"search_chats": "Search chats...",
 		"no_chats_found": "No chats found",
-		"no_recent_chats": "No recent chats",
 		"no_shared_chats": "No shared chats",
-		"view_all_chats": "View all chats",
 		"view_all_shared_chats": "View all shared chats",
 		"view_all_private_chats": "View all private chats",
-		"all_chats": "All Chats",
-		"all_chats_description": "Browse and manage all your chats",
 		"no_chats": "No chats yet",
 		"start_new_chat_hint": "Start a new chat",
 		"error_loading_chats": "Error loading chats",
 		"chat_deleted": "Chat deleted successfully",
 		"error_deleting_chat": "Failed to delete chat",
-		"search_space": "Search Space",
-		"notes": "Notes",
-		"all_notes": "All Notes",
-		"all_notes_description": "Browse and manage all your notes",
-		"search_notes": "Search notes...",
-		"no_results_found": "No notes found",
-		"try_different_search": "Try a different search term",
-		"no_notes": "No notes yet",
-		"create_new_note": "Create a new note",
-		"error_loading_notes": "Error loading notes",
-		"loading": "Loading...",
-		"deleting": "Deleting...",
 		"delete": "Delete",
-		"created": "Created",
+		"try_different_search": "Try a different search term",
 		"updated": "Updated",
 		"more_options": "More options",
 		"clear_search": "Clear search",
-		"view_all_notes": "View all notes",
-		"add_note": "Add note",
 		"archive": "Archive",
 		"unarchive": "Restore",
 		"chat_archived": "Chat archived",
diff --git a/surfsense_web/messages/zh.json b/surfsense_web/messages/zh.json
index 59dc0ca20..fe13de4c0 100644
--- a/surfsense_web/messages/zh.json
+++ b/surfsense_web/messages/zh.json
@@ -631,40 +631,27 @@
 	"sidebar": {
 		"chats": "私人对话",
 		"shared_chats": "共享对话",
-		"recent_chats": "最近对话",
 		"search_chats": "搜索对话...",
 		"no_chats_found": "未找到对话",
-		"no_recent_chats": "暂无最近对话",
 		"no_shared_chats": "暂无共享对话",
-		"view_all_chats": "查看所有对话",
 		"view_all_shared_chats": "查看所有共享对话",
 		"view_all_private_chats": "查看所有私人对话",
-		"all_chats": "所有对话",
-		"all_chats_description": "浏览和管理您的所有对话",
 		"no_chats": "暂无对话",
 		"start_new_chat_hint": "开始新对话",
 		"error_loading_chats": "加载对话时出错",
 		"chat_deleted": "对话删除成功",
 		"error_deleting_chat": "删除对话失败",
-		"search_space": "搜索空间",
-		"notes": "笔记",
-		"all_notes": "所有笔记",
-		"all_notes_description": "浏览和管理您的所有笔记",
-		"search_notes": "搜索笔记...",
-		"no_results_found": "未找到笔记",
-		"try_different_search": "尝试其他搜索词",
-		"no_notes": "暂无笔记",
-		"create_new_note": "创建新笔记",
-		"error_loading_notes": "加载笔记时出错",
-		"loading": "加载中...",
-		"deleting": "删除中...",
 		"delete": "删除",
-		"created": "创建时间",
+		"try_different_search": "尝试其他搜索词",
 		"updated": "更新时间",
 		"more_options": "更多选项",
 		"clear_search": "清除搜索",
-		"view_all_notes": "查看所有笔记",
-		"add_note": "添加笔记",
+		"archive": "归档",
+		"unarchive": "恢复",
+		"chat_archived": "对话已归档",
+		"chat_unarchived": "对话已恢复",
+		"no_archived_chats": "暂无已归档对话",
+		"error_archiving_chat": "归档对话失败",
 		"new_chat": "新对话",
 		"select_search_space": "选择搜索空间",
 		"manage_members": "管理成员",