diff --git a/src/core/components/layout-utils.jsx b/src/core/components/layout-utils.jsx
index 1e36d5dc2e7..6b72c0f621b 100644
--- a/src/core/components/layout-utils.jsx
+++ b/src/core/components/layout-utils.jsx
@@ -118,13 +118,15 @@ export class Button extends React.Component {
     mod: "primary"
   }
 
-  defaultClasses = () => !this.props.unstyled ? `sui-btn sui-btn--${this.props.mod}` : ""
+  defaultClasses = ({ unstyled, mod }) => !unstyled ? `sui-btn sui-btn--${mod}` : ""
 
   render() {
+    const { unstyled, mod, className, ...props } = this.props
+    
     return (
       <button
-        {...this.props}
-        className={xclass(this.props.className, this.defaultClasses())}    
+        {...props}
+        className={xclass(className, this.defaultClasses({ unstyled, mod }))}    
       />
     )
   }