diff --git a/tools/ui-components/src/button/button.tsx b/tools/ui-components/src/button/button.tsx
index d618f5b5df7..6dce5befe6e 100644
--- a/tools/ui-components/src/button/button.tsx
+++ b/tools/ui-components/src/button/button.tsx
@@ -46,7 +46,7 @@ const computeClassNames = ({
         'bg-default-background-danger',
         'text-default-foreground-danger',
         ...(disabled
-          ? []
+          ? ['active:before:hidden']
           : [
               'hover:bg-default-background-danger-hover',
               'hover:text-default-foreground-danger-hover'
@@ -59,7 +59,7 @@ const computeClassNames = ({
         'bg-default-background-info',
         'text-default-foreground-info',
         ...(disabled
-          ? []
+          ? ['active:before:hidden']
           : [
               'hover:bg-default-background-info-hover',
               'hover:text-default-foreground-info-hover'
@@ -73,7 +73,7 @@ const computeClassNames = ({
         'bg-default-background-quaternary',
         'text-default-foreground-secondary',
         ...(disabled
-          ? []
+          ? ['active:before:hidden']
           : [
               'hover:bg-default-background-primary-hover',
               'hover:text-default-foreground-primary-hover'