diff --git a/superset-frontend/src/components/Button/index.tsx b/superset-frontend/src/components/Button/index.tsx
index 8851a6f9cd688..63a017836a1f7 100644
--- a/superset-frontend/src/components/Button/index.tsx
+++ b/superset-frontend/src/components/Button/index.tsx
@@ -206,6 +206,7 @@ export default function Button(props: ButtonProps) {
             buttonStyle === 'link' ? 'transparent' : backgroundColorDisabled,
           borderColor:
             buttonStyle === 'link' ? 'transparent' : borderColorDisabled,
+          pointerEvents: 'none',
         },
         marginLeft: 0,
         '& + .superset-button': {
@@ -230,7 +231,11 @@ export default function Button(props: ButtonProps) {
       >
         {/* this ternary wraps the button in a span so that the tooltip shows up
         when the button is disabled.  */}
-        {disabled ? <span>{button}</span> : button}
+        {disabled ? (
+          <span css={{ cursor: 'not-allowed' }}>{button}</span>
+        ) : (
+          button
+        )}
       </Tooltip>
     );
   }