diff --git a/js/src/common/components/Button.js b/js/src/common/components/Button.js
index b9bd91bc4..4c50b8e99 100644
--- a/js/src/common/components/Button.js
+++ b/js/src/common/components/Button.js
@@ -45,7 +45,7 @@ export default class Button extends Component {
       delete attrs.onclick;
     }
 
-    attrs.className = classList([attrs.className, iconName && 'hasIcon', attrs.disabled && 'disabled', loading && 'loading']);
+    attrs.className = classList([attrs.className, iconName && 'hasIcon', (attrs.disabled || loading) && 'disabled', loading && 'loading']);
 
     return <button {...attrs}>{this.getButtonContent(vnode.children)}</button>;
   }