diff --git a/packages/css/src/components/tabs/tabs.scss b/packages/css/src/components/tabs/tabs.scss
index 278921c595..5a37678f76 100644
--- a/packages/css/src/components/tabs/tabs.scss
+++ b/packages/css/src/components/tabs/tabs.scss
@@ -62,6 +62,10 @@
       background-color: SelectedItem;
     }
   }
+
+  * {
+    pointer-events: none;
+  }
 }
 
 .ams-tabs__button-label,
diff --git a/packages/react/src/Tabs/TabsButton.tsx b/packages/react/src/Tabs/TabsButton.tsx
index d73f15c3ef..384db944c2 100644
--- a/packages/react/src/Tabs/TabsButton.tsx
+++ b/packages/react/src/Tabs/TabsButton.tsx
@@ -5,7 +5,7 @@
 
 import clsx from 'clsx'
 import { forwardRef, startTransition, useContext } from 'react'
-import type { ButtonHTMLAttributes, ForwardedRef, PropsWithChildren } from 'react'
+import type { ButtonHTMLAttributes, ForwardedRef, MouseEvent, PropsWithChildren } from 'react'
 import { TabsContext } from './TabsContext'
 
 export type TabsButtonProps = {
@@ -14,9 +14,16 @@ export type TabsButtonProps = {
 } & PropsWithChildren<ButtonHTMLAttributes<HTMLButtonElement>>
 
 export const TabsButton = forwardRef(
-  ({ children, className, tab = 0, ...restProps }: TabsButtonProps, ref: ForwardedRef<HTMLButtonElement>) => {
+  ({ children, className, onClick, tab = 0, ...restProps }: TabsButtonProps, ref: ForwardedRef<HTMLButtonElement>) => {
     const { activeTab, tabsId, updateTab } = useContext(TabsContext)
 
+    const handleClick = (event: MouseEvent<HTMLButtonElement>) => {
+      onClick?.(event)
+      startTransition(() => {
+        updateTab(tab)
+      })
+    }
+
     return (
       <button
         {...restProps}
@@ -24,11 +31,7 @@ export const TabsButton = forwardRef(
         aria-selected={activeTab === tab}
         className={clsx('ams-tabs__button', className)}
         id={`${tabsId}-tab-${tab}`}
-        onClick={() => {
-          startTransition(() => {
-            updateTab(tab)
-          })
-        }}
+        onClick={handleClick}
         ref={ref}
         role="tab"
         tabIndex={activeTab === tab ? 0 : -1}