diff --git a/surfsense_web/components/layout/ui/sidebar/AllPrivateChatsSidebar.tsx b/surfsense_web/components/layout/ui/sidebar/AllPrivateChatsSidebar.tsx
index ed5cec00e..1d4f590bd 100644
--- a/surfsense_web/components/layout/ui/sidebar/AllPrivateChatsSidebar.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/AllPrivateChatsSidebar.tsx
@@ -32,6 +32,7 @@ import { Spinner } from "@/components/ui/spinner";
 import { Tabs, TabsList, TabsTrigger } from "@/components/ui/tabs";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
 import { useDebouncedValue } from "@/hooks/use-debounced-value";
+import { useIsMobile } from "@/hooks/use-mobile";
 import {
 	deleteThread,
 	fetchThreads,
@@ -57,6 +58,7 @@ export function AllPrivateChatsSidebar({
 	const router = useRouter();
 	const params = useParams();
 	const queryClient = useQueryClient();
+	const isMobile = useIsMobile();
 
 	const currentChatId = Array.isArray(params.chat_id)
 		? Number(params.chat_id[0])
@@ -338,25 +340,37 @@ export function AllPrivateChatsSidebar({
 													isBusy && "opacity-50 pointer-events-none"
 												)}
 											>
-												<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>
-														</button>
-													</TooltipTrigger>
-													<TooltipContent side="bottom" align="start">
-														<p>
-															{t("updated") || "Updated"}:{" "}
-															{format(new Date(thread.updatedAt), "MMM d, yyyy 'at' h:mm a")}
-														</p>
-													</TooltipContent>
-												</Tooltip>
+												{isMobile ? (
+													<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>
+													</button>
+												) : (
+													<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>
+															</button>
+														</TooltipTrigger>
+														<TooltipContent side="bottom" align="start">
+															<p>
+																{t("updated") || "Updated"}:{" "}
+																{format(new Date(thread.updatedAt), "MMM d, yyyy 'at' h:mm a")}
+															</p>
+														</TooltipContent>
+													</Tooltip>
+												)}
 
 												<DropdownMenu
 													open={openDropdownId === thread.id}
diff --git a/surfsense_web/components/layout/ui/sidebar/AllSharedChatsSidebar.tsx b/surfsense_web/components/layout/ui/sidebar/AllSharedChatsSidebar.tsx
index 637a29667..db7ca73b2 100644
--- a/surfsense_web/components/layout/ui/sidebar/AllSharedChatsSidebar.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/AllSharedChatsSidebar.tsx
@@ -32,6 +32,7 @@ import { Spinner } from "@/components/ui/spinner";
 import { Tabs, TabsList, TabsTrigger } from "@/components/ui/tabs";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
 import { useDebouncedValue } from "@/hooks/use-debounced-value";
+import { useIsMobile } from "@/hooks/use-mobile";
 import {
 	deleteThread,
 	fetchThreads,
@@ -57,6 +58,7 @@ export function AllSharedChatsSidebar({
 	const router = useRouter();
 	const params = useParams();
 	const queryClient = useQueryClient();
+	const isMobile = useIsMobile();
 
 	const currentChatId = Array.isArray(params.chat_id)
 		? Number(params.chat_id[0])
@@ -338,25 +340,37 @@ export function AllSharedChatsSidebar({
 													isBusy && "opacity-50 pointer-events-none"
 												)}
 											>
-												<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>
-														</button>
-													</TooltipTrigger>
-													<TooltipContent side="bottom" align="start">
-														<p>
-															{t("updated") || "Updated"}:{" "}
-															{format(new Date(thread.updatedAt), "MMM d, yyyy 'at' h:mm a")}
-														</p>
-													</TooltipContent>
-												</Tooltip>
+												{isMobile ? (
+													<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>
+													</button>
+												) : (
+													<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>
+															</button>
+														</TooltipTrigger>
+														<TooltipContent side="bottom" align="start">
+															<p>
+																{t("updated") || "Updated"}:{" "}
+																{format(new Date(thread.updatedAt), "MMM d, yyyy 'at' h:mm a")}
+															</p>
+														</TooltipContent>
+													</Tooltip>
+												)}
 
 												<DropdownMenu
 													open={openDropdownId === thread.id}
diff --git a/surfsense_web/components/layout/ui/sidebar/MobileSidebar.tsx b/surfsense_web/components/layout/ui/sidebar/MobileSidebar.tsx
index 7ffa8baa4..53421230e 100644
--- a/surfsense_web/components/layout/ui/sidebar/MobileSidebar.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/MobileSidebar.tsx
@@ -153,8 +153,22 @@ export function MobileSidebar({
 						onChatRename={onChatRename}
 						onChatDelete={onChatDelete}
 						onChatArchive={onChatArchive}
-						onViewAllSharedChats={onViewAllSharedChats}
-						onViewAllPrivateChats={onViewAllPrivateChats}
+					onViewAllSharedChats={
+						onViewAllSharedChats
+							? () => {
+									onOpenChange(false);
+									onViewAllSharedChats();
+								}
+							: undefined
+					}
+					onViewAllPrivateChats={
+						onViewAllPrivateChats
+							? () => {
+									onOpenChange(false);
+									onViewAllPrivateChats();
+								}
+							: undefined
+					}
 						user={user}
 						onSettings={onSettings}
 						onManageMembers={onManageMembers}