diff --git a/surfsense_web/components/public-chat-snapshots/public-chat-snapshot-row.tsx b/surfsense_web/components/public-chat-snapshots/public-chat-snapshot-row.tsx
index e1fdb5605..1e7de9f23 100644
--- a/surfsense_web/components/public-chat-snapshots/public-chat-snapshot-row.tsx
+++ b/surfsense_web/components/public-chat-snapshots/public-chat-snapshot-row.tsx
@@ -1,7 +1,8 @@
 "use client";
 
-import { Copy, ExternalLink, MessageSquare, Trash2 } from "lucide-react";
+import { Check, Copy, ExternalLink, MessageSquare, Trash2 } from "lucide-react";
 import Image from "next/image";
+import { useCallback, useRef, useState } from "react";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
 import { Card, CardContent } from "@/components/ui/card";
@@ -33,6 +34,16 @@ export function PublicChatSnapshotRow({
 	isDeleting = false,
 	memberMap,
 }: PublicChatSnapshotRowProps) {
+	const [copied, setCopied] = useState(false);
+	const copyTimeoutRef = useRef<ReturnType<typeof setTimeout>>();
+
+	const handleCopyClick = useCallback(() => {
+		onCopy(snapshot);
+		setCopied(true);
+		clearTimeout(copyTimeoutRef.current);
+		copyTimeoutRef.current = setTimeout(() => setCopied(false), 2000);
+	}, [onCopy, snapshot]);
+
 	const formattedDate = new Date(snapshot.created_at).toLocaleDateString(undefined, {
 		year: "numeric",
 		month: "short",
@@ -63,27 +74,18 @@ export function PublicChatSnapshotRow({
 									<Button
 										variant="ghost"
 										size="icon"
-										onClick={() => onCopy(snapshot)}
+										asChild
 										className="h-7 w-7 text-muted-foreground hover:text-foreground"
 									>
-										<Copy className="h-3 w-3" />
+										<a
+											href={snapshot.public_url}
+											target="_blank"
+											rel="noopener noreferrer"
+										>
+											<ExternalLink className="h-3 w-3" />
+										</a>
 									</Button>
 								</TooltipTrigger>
-								<TooltipContent>Copy link</TooltipContent>
-							</Tooltip>
-						</TooltipProvider>
-						<TooltipProvider>
-							<Tooltip>
-								<TooltipTrigger asChild>
-									<a
-										href={snapshot.public_url}
-										target="_blank"
-										rel="noopener noreferrer"
-										className="inline-flex items-center justify-center h-7 w-7 rounded-md text-muted-foreground hover:text-foreground hover:bg-accent transition-colors"
-									>
-										<ExternalLink className="h-3 w-3" />
-									</a>
-								</TooltipTrigger>
 								<TooltipContent>Open link</TooltipContent>
 							</Tooltip>
 						</TooltipProvider>
@@ -108,18 +110,47 @@ export function PublicChatSnapshotRow({
 					</div>
 				</div>
 
-				{/* Message count badge */}
-				<div className="flex items-center gap-1.5">
-					<Badge
-						variant="outline"
-						className="text-[10px] px-1.5 py-0.5 border-muted-foreground/20 text-muted-foreground"
-					>
-						<MessageSquare className="h-2.5 w-2.5 mr-1" />
-						{snapshot.message_count} messages
-					</Badge>
-				</div>
+			{/* Message count badge */}
+			<div className="flex items-center gap-1.5">
+				<Badge
+					variant="outline"
+					className="text-[10px] px-1.5 py-0.5 border-muted-foreground/20 text-muted-foreground"
+				>
+					<MessageSquare className="h-2.5 w-2.5 mr-1" />
+					{snapshot.message_count} messages
+				</Badge>
+			</div>
 
-				{/* Footer: Date + Creator */}
+			{/* Public URL – selectable fallback for manual copy */}
+			<div className="flex items-center gap-2 rounded-md border border-border/60 bg-muted/30 px-2.5 py-1.5">
+				<p
+					className="min-w-0 flex-1 text-[10px] font-mono text-muted-foreground break-all select-all cursor-text"
+					title={snapshot.public_url}
+				>
+					{snapshot.public_url}
+				</p>
+				<TooltipProvider>
+					<Tooltip>
+						<TooltipTrigger asChild>
+							<Button
+								variant="ghost"
+								size="icon"
+								onClick={handleCopyClick}
+								className="h-6 w-6 shrink-0 text-muted-foreground hover:text-foreground"
+							>
+								{copied ? (
+									<Check className="h-3 w-3 text-green-500" />
+								) : (
+									<Copy className="h-3 w-3" />
+								)}
+							</Button>
+						</TooltipTrigger>
+						<TooltipContent>{copied ? "Copied!" : "Copy link"}</TooltipContent>
+					</Tooltip>
+				</TooltipProvider>
+			</div>
+
+			{/* Footer: Date + Creator */}
 				<div className="flex items-center gap-2 pt-2 border-t border-border/40 mt-auto">
 					<span className="text-[11px] text-muted-foreground/60">
 						{formattedDate}
diff --git a/surfsense_web/components/public-chat-snapshots/public-chat-snapshots-list.tsx b/surfsense_web/components/public-chat-snapshots/public-chat-snapshots-list.tsx
index 8daf9a07f..7a07c62ee 100644
--- a/surfsense_web/components/public-chat-snapshots/public-chat-snapshots-list.tsx
+++ b/surfsense_web/components/public-chat-snapshots/public-chat-snapshots-list.tsx
@@ -26,7 +26,7 @@ export function PublicChatSnapshotsList({
 	}
 
 	return (
-		<div className="grid gap-3 grid-cols-1 sm:grid-cols-2 xl:grid-cols-3">
+		<div className="grid gap-3 grid-cols-1 sm:grid-cols-2">
 			{snapshots.map((snapshot) => (
 				<PublicChatSnapshotRow
 					key={snapshot.id}
diff --git a/surfsense_web/components/public-chat-snapshots/public-chat-snapshots-manager.tsx b/surfsense_web/components/public-chat-snapshots/public-chat-snapshots-manager.tsx
index a11e11198..5b872404d 100644
--- a/surfsense_web/components/public-chat-snapshots/public-chat-snapshots-manager.tsx
+++ b/surfsense_web/components/public-chat-snapshots/public-chat-snapshots-manager.tsx
@@ -62,7 +62,6 @@ export function PublicChatSnapshotsManager({
 	const handleCopy = useCallback((snapshot: PublicChatSnapshotDetail) => {
 		const publicUrl = `${window.location.origin}/public/${snapshot.share_token}`;
 		navigator.clipboard.writeText(publicUrl);
-		toast.success("Link copied to clipboard");
 	}, []);
 
 	const handleDelete = useCallback(
@@ -90,7 +89,7 @@ export function PublicChatSnapshotsManager({
 				<Skeleton className="h-12 w-full rounded-lg" />
 
 				{/* Cards grid skeleton */}
-				<div className="grid gap-3 grid-cols-1 sm:grid-cols-2 xl:grid-cols-3">
+				<div className="grid gap-3 grid-cols-1 sm:grid-cols-2">
 					{["skeleton-a", "skeleton-b", "skeleton-c"].map((key) => (
 						<Card key={key} className="border-border/60">
 							<CardContent className="p-4 flex flex-col gap-3">
@@ -98,11 +97,13 @@ export function PublicChatSnapshotsManager({
 								<div className="flex items-start justify-between gap-2">
 									<Skeleton className="h-4 w-36 md:w-44" />
 								</div>
-								{/* Message count badge */}
-								<div className="flex items-center gap-1.5">
-									<Skeleton className="h-5 w-24 rounded-full" />
-								</div>
-								{/* Footer: Date + Creator */}
+							{/* Message count badge */}
+							<div className="flex items-center gap-1.5">
+								<Skeleton className="h-5 w-24 rounded-full" />
+							</div>
+							{/* URL skeleton */}
+							<Skeleton className="h-3 w-full rounded" />
+							{/* Footer: Date + Creator */}
 								<div className="flex items-center gap-2 pt-2 border-t border-border/40">
 									<Skeleton className="h-3 w-20" />
 									<Skeleton className="h-4 w-4 rounded-full" />