diff --git a/src/components/Button/index.js b/src/components/Button/index.js
index dc12a4ded5c2..26d33b1431b8 100644
--- a/src/components/Button/index.js
+++ b/src/components/Button/index.js
@@ -301,6 +301,7 @@ class Button extends Component {
                     this.props.isDisabled && !this.props.danger && !this.props.success ? styles.buttonDisabled : undefined,
                     this.props.shouldRemoveRightBorderRadius ? styles.noRightBorderRadius : undefined,
                     this.props.shouldRemoveLeftBorderRadius ? styles.noLeftBorderRadius : undefined,
+                    this.props.icon || this.props.shouldShowRightIcon ? styles.alignItemsStretch : undefined,
                     ...this.props.innerStyles,
                 ]}
                 hoverStyle={[