diff --git a/src/components/TableToolbar/TableToolbarButton.tsx b/src/components/TableToolbar/TableToolbarButton.tsx
index 40f4b065..81f7dc64 100644
--- a/src/components/TableToolbar/TableToolbarButton.tsx
+++ b/src/components/TableToolbar/TableToolbarButton.tsx
@@ -4,27 +4,38 @@ import { Tooltip, Button, ButtonProps } from "@mui/material";
 export interface ITableToolbarButtonProps extends Partial<ButtonProps> {
   title: string;
   icon: React.ReactNode;
+  tooltip?: string;
 }
 
 export const TableToolbarButton = forwardRef(function TableToolbarButton_(
-  { title, icon, ...props }: ITableToolbarButtonProps,
+  { title, icon, tooltip, ...props }: ITableToolbarButtonProps,
   ref: React.Ref<HTMLButtonElement>
 ) {
+  // https://mui.com/material-ui/react-tooltip/#accessibility
+  const tooltipIsDescription = Boolean(tooltip);
+
+  const button = (
+    <Button
+      variant="outlined"
+      color="secondary"
+      size="small"
+      style={{ minWidth: 40, height: 32, padding: 0 }}
+      {...props}
+      {...(tooltipIsDescription
+        ? {
+            "aria-label": title, // Actual button label
+            title: tooltip, // Tooltip text, used to describe button e.g. why it’s disabled
+          }
+        : {})}
+      ref={ref}
+    >
+      {icon}
+    </Button>
+  );
+
   return (
-    <Tooltip title={title}>
-      <span>
-        <Button
-          variant="outlined"
-          color="secondary"
-          size="small"
-          style={{ minWidth: 40, height: 32, padding: 0 }}
-          aria-label={title}
-          {...props}
-          ref={ref}
-        >
-          {icon}
-        </Button>
-      </span>
+    <Tooltip title={tooltip || title} describeChild={tooltipIsDescription}>
+      {props.disabled ? <span title="">{button}</span> : button}
     </Tooltip>
   );
 });