diff --git a/surfsense_web/app/dashboard/[search_space_id]/onboard/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/onboard/page.tsx
index 17db12ab7..8dbc6b919 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/onboard/page.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/onboard/page.tsx
@@ -259,7 +259,7 @@ export default function OnboardPage() {
 						You can add more configurations and customize settings anytime in{" "}
 						<button
 							type="button"
-							onClick={() => router.push(`/dashboard/${searchSpaceId}/settings?section=general`)}
+							onClick={() => router.push(`/dashboard/${searchSpaceId}/settings?tab=general`)}
 							className="text-violet-500 hover:underline"
 						>
 							Settings
diff --git a/surfsense_web/app/dashboard/[search_space_id]/settings/layout.tsx b/surfsense_web/app/dashboard/[search_space_id]/settings/layout.tsx
index 929a5cb62..e5fa6be12 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/settings/layout.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/settings/layout.tsx
@@ -1,9 +1,5 @@
 import type React from "react";
 
-/**
- * Settings layout - renders children directly without the parent sidebar
- * This creates a full-screen settings experience
- */
 export default function SettingsLayout({ children }: { children: React.ReactNode }) {
-	return <div className="fixed inset-0 z-50 bg-background">{children}</div>;
+	return <>{children}</>;
 }
diff --git a/surfsense_web/app/dashboard/[search_space_id]/settings/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/settings/page.tsx
index 7ccd35425..d999aacfb 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/settings/page.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/settings/page.tsx
@@ -1,24 +1,17 @@
 "use client";
 
 import {
-	ArrowLeft,
 	Bot,
 	Brain,
-	ChevronRight,
 	FileText,
 	Globe,
 	ImageIcon,
-	type LucideIcon,
-	Menu,
 	MessageSquare,
-	Settings,
 	Shield,
-	X,
 } from "lucide-react";
-import { AnimatePresence, motion } from "motion/react";
 import { useParams, useRouter, useSearchParams } from "next/navigation";
 import { useTranslations } from "next-intl";
-import { useCallback, useEffect, useState } from "react";
+import { useCallback, useEffect } from "react";
 import { PublicChatSnapshotsManager } from "@/components/public-chat-snapshots/public-chat-snapshots-manager";
 import { GeneralSettingsManager } from "@/components/settings/general-settings-manager";
 import { ImageModelManager } from "@/components/settings/image-model-manager";
@@ -26,347 +19,108 @@ import { LLMRoleManager } from "@/components/settings/llm-role-manager";
 import { ModelConfigManager } from "@/components/settings/model-config-manager";
 import { PromptConfigManager } from "@/components/settings/prompt-config-manager";
 import { RolesManager } from "@/components/settings/roles-manager";
-import { Button } from "@/components/ui/button";
+import {
+	Tabs,
+	TabsContent,
+	TabsList,
+	TabsTrigger,
+} from "@/components/ui/animated-tabs";
 import { trackSettingsViewed } from "@/lib/posthog/events";
-import { cn } from "@/lib/utils";
 
-interface SettingsNavItem {
-	id: string;
-	labelKey: string;
-	descriptionKey: string;
-	icon: LucideIcon;
-}
+const VALID_TABS = [
+	"general",
+	"models",
+	"roles",
+	"image-models",
+	"prompts",
+	"public-links",
+	"team-roles",
+] as const;
 
-const settingsNavItems: SettingsNavItem[] = [
-	{
-		id: "general",
-		labelKey: "nav_general",
-		descriptionKey: "nav_general_desc",
-		icon: FileText,
-	},
-	{
-		id: "models",
-		labelKey: "nav_agent_configs",
-		descriptionKey: "nav_agent_configs_desc",
-		icon: Bot,
-	},
-	{
-		id: "roles",
-		labelKey: "nav_role_assignments",
-		descriptionKey: "nav_role_assignments_desc",
-		icon: Brain,
-	},
-	{
-		id: "image-models",
-		labelKey: "nav_image_models",
-		descriptionKey: "nav_image_models_desc",
-		icon: ImageIcon,
-	},
-	{
-		id: "prompts",
-		labelKey: "nav_system_instructions",
-		descriptionKey: "nav_system_instructions_desc",
-		icon: MessageSquare,
-	},
-	{
-		id: "public-links",
-		labelKey: "nav_public_links",
-		descriptionKey: "nav_public_links_desc",
-		icon: Globe,
-	},
-	{
-		id: "team-roles",
-		labelKey: "nav_team_roles",
-		descriptionKey: "nav_team_roles_desc",
-		icon: Shield,
-	},
-];
-
-function SettingsSidebar({
-	activeSection,
-	onSectionChange,
-	onBackToApp,
-	isOpen,
-	onClose,
-}: {
-	activeSection: string;
-	onSectionChange: (section: string) => void;
-	onBackToApp: () => void;
-	isOpen: boolean;
-	onClose: () => void;
-}) {
-	const t = useTranslations("searchSpaceSettings");
-
-	const handleNavClick = (sectionId: string) => {
-		onSectionChange(sectionId);
-		onClose(); // Close sidebar on mobile after selection
-	};
-
-	return (
-		<>
-			{/* Mobile overlay */}
-			<AnimatePresence>
-				{isOpen && (
-					<motion.div
-						initial={{ opacity: 0 }}
-						animate={{ opacity: 1 }}
-						exit={{ opacity: 0 }}
-						transition={{ duration: 0.2 }}
-						className="fixed inset-0 bg-background/80 backdrop-blur-sm z-40 md:hidden"
-						onClick={onClose}
-					/>
-				)}
-			</AnimatePresence>
-
-			{/* Sidebar */}
-			<aside
-				className={cn(
-					"fixed md:relative left-0 top-0 z-50 md:z-auto",
-					"w-72 shrink-0 bg-background md:bg-muted/30 h-full flex flex-col",
-					"md:border-r",
-					"transition-transform duration-300 ease-out",
-					"md:translate-x-0",
-					isOpen ? "translate-x-0" : "-translate-x-full md:translate-x-0"
-				)}
-			>
-				{/* Header with title */}
-				<div className="p-4 space-y-3">
-					<div className="flex items-center justify-between">
-						<Button
-							variant="ghost"
-							onClick={onBackToApp}
-							className="justify-start gap-3 h-11 px-3 hover:bg-muted group"
-						>
-							<div className="flex items-center justify-center w-8 h-8 rounded-lg bg-primary/10 group-hover:bg-primary/20 transition-colors">
-								<ArrowLeft className="h-4 w-4 text-primary" />
-							</div>
-							<span className="font-medium">{t("back_to_app")}</span>
-						</Button>
-						{/* Mobile close button */}
-						<Button variant="ghost" size="icon" onClick={onClose} className="md:hidden h-9 w-9">
-							<X className="h-5 w-5" />
-						</Button>
-					</div>
-					{/* Settings Title */}
-					<div className="px-3">
-						<h2 className="text-lg font-semibold text-foreground">{t("title")}</h2>
-					</div>
-				</div>
-
-				{/* Navigation Items */}
-				<nav className="flex-1 px-3 py-2 space-y-1 overflow-y-auto">
-					{settingsNavItems.map((item, index) => {
-						const isActive = activeSection === item.id;
-						const Icon = item.icon;
-
-						return (
-							<motion.button
-								key={item.id}
-								initial={{ opacity: 0, x: -10 }}
-								animate={{ opacity: 1, x: 0 }}
-								transition={{ delay: 0.1 + index * 0.05, duration: 0.3 }}
-								onClick={() => handleNavClick(item.id)}
-								whileHover={{ scale: 1.01 }}
-								whileTap={{ scale: 0.99 }}
-								className={cn(
-									"relative w-full flex items-center gap-3 px-3 py-3 rounded-xl text-left transition-all duration-200",
-									isActive ? "bg-muted shadow-sm border border-border" : "hover:bg-muted/60"
-								)}
-							>
-								{isActive && (
-									<motion.div
-										layoutId="settingsActiveIndicator"
-										className="absolute left-0 top-1/2 -translate-y-1/2 w-1 h-8 bg-primary rounded-r-full"
-										initial={false}
-										transition={{
-											type: "spring",
-											stiffness: 500,
-											damping: 35,
-										}}
-									/>
-								)}
-								<div
-									className={cn(
-										"flex items-center justify-center w-9 h-9 rounded-lg transition-colors",
-										isActive ? "bg-primary/10 text-primary" : "bg-muted text-muted-foreground"
-									)}
-								>
-									<Icon className="h-4 w-4" />
-								</div>
-								<div className="flex-1 min-w-0">
-									<p
-										className={cn(
-											"text-sm font-medium truncate transition-colors",
-											isActive ? "text-foreground" : "text-muted-foreground"
-										)}
-									>
-										{t(item.labelKey)}
-									</p>
-									<p className="text-xs text-muted-foreground/70 truncate">
-										{t(item.descriptionKey)}
-									</p>
-								</div>
-								<ChevronRight
-									className={cn(
-										"h-4 w-4 shrink-0 transition-all",
-										isActive
-											? "text-primary opacity-100 translate-x-0"
-											: "text-muted-foreground/40 opacity-0 -translate-x-1"
-									)}
-								/>
-							</motion.button>
-						);
-					})}
-				</nav>
-			</aside>
-		</>
-	);
-}
-
-function SettingsContent({
-	activeSection,
-	searchSpaceId,
-	onMenuClick,
-}: {
-	activeSection: string;
-	searchSpaceId: number;
-	onMenuClick: () => void;
-}) {
-	const t = useTranslations("searchSpaceSettings");
-	const activeItem = settingsNavItems.find((item) => item.id === activeSection);
-	const Icon = activeItem?.icon || Settings;
-
-	return (
-		<motion.div
-			initial={{ opacity: 0 }}
-			animate={{ opacity: 1 }}
-			transition={{ delay: 0.2, duration: 0.4 }}
-			className="flex-1 min-w-0 h-full overflow-hidden bg-background"
-		>
-			<div className="h-full overflow-y-auto">
-				<div className="max-w-4xl mx-auto p-4 md:p-6 lg:p-10">
-					{/* Section Header */}
-					<AnimatePresence mode="wait">
-						<motion.div
-							key={`${activeSection}-header`}
-							initial={{ opacity: 0, y: 10 }}
-							animate={{ opacity: 1, y: 0 }}
-							exit={{ opacity: 0, y: -10 }}
-							transition={{ duration: 0.3 }}
-							className="mb-6 md:mb-8"
-						>
-							<div className="flex items-center gap-3 md:gap-4">
-								{/* Mobile menu button */}
-								<Button
-									variant="outline"
-									size="icon"
-									onClick={onMenuClick}
-									className="md:hidden h-10 w-10 shrink-0"
-								>
-									<Menu className="h-5 w-5" />
-								</Button>
-								<motion.div
-									initial={{ scale: 0.8, opacity: 0 }}
-									animate={{ scale: 1, opacity: 1 }}
-									transition={{ delay: 0.1, duration: 0.3 }}
-									className="flex items-center justify-center w-10 h-10 md:w-14 md:h-14 rounded-lg md:rounded-2xl bg-gradient-to-br from-primary/20 to-primary/5 border border-primary/10 shadow-sm shrink-0"
-								>
-									<Icon className="h-5 w-5 md:h-7 md:w-7 text-primary" />
-								</motion.div>
-								<div className="min-w-0">
-									<h1 className="text-lg md:text-2xl font-bold tracking-tight truncate">
-										{activeItem ? t(activeItem.labelKey) : ""}
-									</h1>
-								</div>
-							</div>
-						</motion.div>
-					</AnimatePresence>
-
-					{/* Section Content */}
-					<AnimatePresence mode="wait">
-						<motion.div
-							key={activeSection}
-							initial={{ opacity: 0, y: 20 }}
-							animate={{ opacity: 1, y: 0 }}
-							exit={{ opacity: 0, y: -20 }}
-							transition={{
-								duration: 0.35,
-								ease: [0.4, 0, 0.2, 1],
-							}}
-						>
-							{activeSection === "general" && (
-								<GeneralSettingsManager searchSpaceId={searchSpaceId} />
-							)}
-							{activeSection === "models" && <ModelConfigManager searchSpaceId={searchSpaceId} />}
-							{activeSection === "roles" && <LLMRoleManager searchSpaceId={searchSpaceId} />}
-							{activeSection === "image-models" && (
-								<ImageModelManager searchSpaceId={searchSpaceId} />
-							)}
-							{activeSection === "prompts" && <PromptConfigManager searchSpaceId={searchSpaceId} />}
-							{activeSection === "public-links" && (
-								<PublicChatSnapshotsManager searchSpaceId={searchSpaceId} />
-							)}
-							{activeSection === "team-roles" && <RolesManager searchSpaceId={searchSpaceId} />}
-						</motion.div>
-					</AnimatePresence>
-				</div>
-			</div>
-		</motion.div>
-	);
-}
-
-const VALID_SECTIONS = new Set(settingsNavItems.map((item) => item.id));
-const DEFAULT_SECTION = "general";
+const DEFAULT_TAB = "general";
 
 export default function SettingsPage() {
+	const t = useTranslations("searchSpaceSettings");
 	const router = useRouter();
 	const params = useParams();
 	const searchParams = useSearchParams();
 	const searchSpaceId = Number(params.search_space_id);
-	const [isSidebarOpen, setIsSidebarOpen] = useState(false);
 
-	const sectionParam = searchParams.get("section");
-	const activeSection =
-		sectionParam && VALID_SECTIONS.has(sectionParam) ? sectionParam : DEFAULT_SECTION;
+	const tabParam = searchParams.get("tab") ?? "";
+	const activeTab = VALID_TABS.includes(tabParam as (typeof VALID_TABS)[number])
+		? tabParam
+		: DEFAULT_TAB;
 
-	const handleSectionChange = useCallback(
-		(section: string) => {
-			router.replace(`/dashboard/${searchSpaceId}/settings?section=${section}`, { scroll: false });
+	const handleTabChange = useCallback(
+		(value: string) => {
+			const p = new URLSearchParams(searchParams.toString());
+			p.set("tab", value);
+			router.replace(`?${p.toString()}`, { scroll: false });
 		},
-		[router, searchSpaceId]
+		[router, searchParams]
 	);
 
 	useEffect(() => {
-		trackSettingsViewed(searchSpaceId, activeSection);
-	}, [searchSpaceId, activeSection]);
-
-	const handleBackToApp = useCallback(() => {
-		router.push(`/dashboard/${searchSpaceId}/new-chat`);
-	}, [router, searchSpaceId]);
+		trackSettingsViewed(searchSpaceId, activeTab);
+	}, [searchSpaceId, activeTab]);
 
 	return (
-		<motion.div
-			initial={{ opacity: 0 }}
-			animate={{ opacity: 1 }}
-			transition={{ duration: 0.3 }}
-			className="fixed inset-0 z-50 flex bg-muted/40"
-		>
-			<div className="flex h-full w-full p-0 md:p-2">
-				<div className="flex h-full w-full overflow-hidden bg-background md:rounded-xl md:border md:shadow-sm">
-					<SettingsSidebar
-						activeSection={activeSection}
-						onSectionChange={handleSectionChange}
-						onBackToApp={handleBackToApp}
-						isOpen={isSidebarOpen}
-						onClose={() => setIsSidebarOpen(false)}
-					/>
-					<SettingsContent
-						activeSection={activeSection}
-						searchSpaceId={searchSpaceId}
-						onMenuClick={() => setIsSidebarOpen(true)}
-					/>
-				</div>
+		<div className="h-full overflow-y-auto">
+			<div className="mx-auto w-full max-w-4xl px-4 py-10">
+				<Tabs value={activeTab} onValueChange={handleTabChange} className="w-full">
+					<TabsList showBottomBorder>
+						<TabsTrigger value="general">
+							<FileText className="mr-2 h-4 w-4" />
+							{t("nav_general")}
+						</TabsTrigger>
+						<TabsTrigger value="models">
+							<Bot className="mr-2 h-4 w-4" />
+							{t("nav_agent_configs")}
+						</TabsTrigger>
+						<TabsTrigger value="roles">
+							<Brain className="mr-2 h-4 w-4" />
+							{t("nav_role_assignments")}
+						</TabsTrigger>
+						<TabsTrigger value="image-models">
+							<ImageIcon className="mr-2 h-4 w-4" />
+							{t("nav_image_models")}
+						</TabsTrigger>
+						<TabsTrigger value="team-roles">
+							<Shield className="mr-2 h-4 w-4" />
+							{t("nav_team_roles")}
+						</TabsTrigger>
+						<TabsTrigger value="prompts">
+							<MessageSquare className="mr-2 h-4 w-4" />
+							{t("nav_system_instructions")}
+						</TabsTrigger>
+						<TabsTrigger value="public-links">
+							<Globe className="mr-2 h-4 w-4" />
+							{t("nav_public_links")}
+						</TabsTrigger>
+					</TabsList>
+					<TabsContent value="general" className="mt-6">
+						<GeneralSettingsManager searchSpaceId={searchSpaceId} />
+					</TabsContent>
+					<TabsContent value="models" className="mt-6">
+						<ModelConfigManager searchSpaceId={searchSpaceId} />
+					</TabsContent>
+					<TabsContent value="roles" className="mt-6">
+						<LLMRoleManager searchSpaceId={searchSpaceId} />
+					</TabsContent>
+					<TabsContent value="image-models" className="mt-6">
+						<ImageModelManager searchSpaceId={searchSpaceId} />
+					</TabsContent>
+					<TabsContent value="prompts" className="mt-6">
+						<PromptConfigManager searchSpaceId={searchSpaceId} />
+					</TabsContent>
+					<TabsContent value="public-links" className="mt-6">
+						<PublicChatSnapshotsManager searchSpaceId={searchSpaceId} />
+					</TabsContent>
+					<TabsContent value="team-roles" className="mt-6">
+						<RolesManager searchSpaceId={searchSpaceId} />
+					</TabsContent>
+				</Tabs>
 			</div>
-		</motion.div>
+		</div>
 	);
 }
diff --git a/surfsense_web/app/dashboard/[search_space_id]/team/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/team/page.tsx
index 1d91d32f0..4b4a702c8 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/team/page.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/team/page.tsx
@@ -611,7 +611,7 @@ function MemberRow({
 						<DropdownMenuSeparator className="dark:bg-white/5" />
 						<DropdownMenuItem
 							onClick={() =>
-								router.push(`/dashboard/${searchSpaceId}/settings?section=team-roles`)
+								router.push(`/dashboard/${searchSpaceId}/settings?tab=team-roles`)
 							}
 						>
 								Manage Roles
diff --git a/surfsense_web/components/assistant-ui/connector-popup.tsx b/surfsense_web/components/assistant-ui/connector-popup.tsx
index 5104efc7b..f234f46eb 100644
--- a/surfsense_web/components/assistant-ui/connector-popup.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup.tsx
@@ -379,7 +379,7 @@ export const ConnectorIndicator: FC = () => {
 														: "You need to configure a Document Summary LLM before adding connectors. This LLM is used to process and summarize documents from your connected sources."}
 												</p>
 												<Button asChild size="sm" variant="outline">
-													<Link href={`/dashboard/${searchSpaceId}/settings?section=models`}>
+													<Link href={`/dashboard/${searchSpaceId}/settings?tab=models`}>
 														<Settings className="mr-2 h-4 w-4" />
 														Go to Settings
 													</Link>
diff --git a/surfsense_web/components/assistant-ui/document-upload-popup.tsx b/surfsense_web/components/assistant-ui/document-upload-popup.tsx
index 1c18379f4..c5a2eb977 100644
--- a/surfsense_web/components/assistant-ui/document-upload-popup.tsx
+++ b/surfsense_web/components/assistant-ui/document-upload-popup.tsx
@@ -158,7 +158,7 @@ const DocumentUploadPopupContent: FC<{
 											: "You need to configure a Document Summary LLM before uploading files. This LLM is used to process and summarize your uploaded documents."}
 									</p>
 									<Button asChild size="sm" variant="outline">
-										<Link href={`/dashboard/${searchSpaceId}/settings?section=models`}>
+										<Link href={`/dashboard/${searchSpaceId}/settings?tab=models`}>
 											<Settings className="mr-2 h-4 w-4" />
 											Go to Settings
 										</Link>
diff --git a/surfsense_web/components/layout/providers/LayoutDataProvider.tsx b/surfsense_web/components/layout/providers/LayoutDataProvider.tsx
index 90ddbdf74..65143669e 100644
--- a/surfsense_web/components/layout/providers/LayoutDataProvider.tsx
+++ b/surfsense_web/components/layout/providers/LayoutDataProvider.tsx
@@ -309,7 +309,7 @@ export function LayoutDataProvider({ searchSpaceId, children }: LayoutDataProvid
 
 	const handleSearchSpaceSettings = useCallback(
 		(space: SearchSpace) => {
-			router.push(`/dashboard/${space.id}/settings?section=general`);
+			router.push(`/dashboard/${space.id}/settings?tab=general`);
 		},
 		[router]
 	);
@@ -478,7 +478,7 @@ export function LayoutDataProvider({ searchSpaceId, children }: LayoutDataProvid
 	);
 
 	const handleSettings = useCallback(() => {
-		router.push(`/dashboard/${searchSpaceId}/settings?section=general`);
+		router.push(`/dashboard/${searchSpaceId}/settings?tab=general`);
 	}, [router, searchSpaceId]);
 
 	const handleManageMembers = useCallback(() => {
diff --git a/surfsense_web/components/new-chat/chat-share-button.tsx b/surfsense_web/components/new-chat/chat-share-button.tsx
index 33a52a974..b0f53d06b 100644
--- a/surfsense_web/components/new-chat/chat-share-button.tsx
+++ b/surfsense_web/components/new-chat/chat-share-button.tsx
@@ -148,7 +148,7 @@ export function ChatShareButton({ thread, onVisibilityChange, className }: ChatS
 						<button
 							type="button"
 							onClick={() =>
-								router.push(`/dashboard/${params.search_space_id}/settings?section=public-links`)
+								router.push(`/dashboard/${params.search_space_id}/settings?tab=public-links`)
 							}
 							className="flex items-center justify-center h-8 w-8 rounded-md bg-muted/50 hover:bg-muted transition-colors"
 						>
diff --git a/surfsense_web/components/ui/animated-tabs.tsx b/surfsense_web/components/ui/animated-tabs.tsx
index 3037d25de..ea45759c4 100644
--- a/surfsense_web/components/ui/animated-tabs.tsx
+++ b/surfsense_web/components/ui/animated-tabs.tsx
@@ -79,6 +79,29 @@ const XScrollable = forwardRef<
   const dragging = useRef(false)
   const startX = useRef(0)
   const startScrollLeft = useRef(0)
+  const [scrollPos, setScrollPos] = useState<"start" | "middle" | "end">("start")
+
+  const updateScrollPos = useCallback(() => {
+    const el = scrollRef.current
+    if (!el) return
+    const canScroll = el.scrollWidth > el.clientWidth + 1
+    if (!canScroll) {
+      setScrollPos("start")
+      return
+    }
+    const atStart = el.scrollLeft <= 2
+    const atEnd = el.scrollWidth - el.scrollLeft - el.clientWidth <= 2
+    setScrollPos(atStart ? "start" : atEnd ? "end" : "middle")
+  }, [])
+
+  useEffect(() => {
+    updateScrollPos()
+    const el = scrollRef.current
+    if (!el) return
+    const ro = new ResizeObserver(updateScrollPos)
+    ro.observe(el)
+    return () => ro.disconnect()
+  }, [updateScrollPos])
 
   const onMouseDown = (e: React.MouseEvent) => {
     if (!scrollRef.current) return
@@ -106,6 +129,14 @@ const XScrollable = forwardRef<
     }
   }
 
+  const handleScroll = useCallback(() => {
+    updateScrollPos()
+  }, [updateScrollPos])
+
+  const maskStart = scrollPos === "start" ? "black" : "transparent"
+  const maskEnd = scrollPos === "end" ? "black" : "transparent"
+  const maskImage = `linear-gradient(to right, ${maskStart}, black 24px, black calc(100% - 24px), ${maskEnd})`
+
   return (
     // biome-ignore lint/a11y/noStaticElementInteractions: drag-scroll container needs mouse events
     <div
@@ -124,8 +155,13 @@ const XScrollable = forwardRef<
           !showScrollbar && "scrollbar-none",
           contentClassName
         )}
+        style={{
+          maskImage,
+          WebkitMaskImage: maskImage,
+        }}
         onWheel={onWheel}
         onMouseDown={onMouseDown}
+        onScroll={handleScroll}
       >
         {children}
       </div>
@@ -329,16 +365,16 @@ const TabsList = forwardRef<
         aria-label={ariaLabel}
         {...props}
       >
+        {showBottomBorder && (
+          <div
+            className={cn(
+              "absolute bottom-0 left-0 right-0 h-px bg-border dark:bg-border z-0",
+              bottomBorderClassName
+            )}
+          />
+        )}
         <XScrollable showScrollbar={false}>
           <div className={cn("relative", showBottomBorder && "pb-px")}>
-            {showBottomBorder && (
-              <div
-                className={cn(
-                  "absolute bottom-0 left-0 right-0 h-px bg-border dark:bg-border",
-                  bottomBorderClassName
-                )}
-              />
-            )}
 
             {showHoverEffect && (
               <div