diff --git a/app/javascript/src/scenes/SettingsPage/scenes/profile/components/InputEnabled.jsx b/app/javascript/src/scenes/SettingsPage/scenes/profile/components/InputEnabled.jsx
index 888d24cf3..48d2a0acb 100644
--- a/app/javascript/src/scenes/SettingsPage/scenes/profile/components/InputEnabled.jsx
+++ b/app/javascript/src/scenes/SettingsPage/scenes/profile/components/InputEnabled.jsx
@@ -7,6 +7,7 @@ import {
   FormControl,
   ControlLabel,
   Button,
+  ButtonToolbar,
   HelpBlock
 } from "react-bootstrap";
 import { updateUser } from "../../../../../services/api/users_api";
@@ -277,7 +278,7 @@ class InputEnabled extends Component {
       .then(() => {
         this.props.reloadInfo();
         this.props.disableEdit();
-        if(this.props.forceRerender) {
+        if (this.props.forceRerender) {
           this.props.forceRerender();
         }
       })
@@ -374,12 +375,14 @@ class InputEnabled extends Component {
             {this.inputField()}
             {this.confirmationField()}
             <StyledHelpBlock>{this.state.errorMessage}</StyledHelpBlock>
-            <Button bsStyle="default" onClick={this.props.disableEdit}>
-              <FormattedMessage id="general.cancel" />
-            </Button>&nbsp;
-            <Button bsStyle="primary" type="submit">
-              <FormattedMessage id="general.update" />
-            </Button>
+            <ButtonToolbar>
+              <Button bsStyle="primary" type="submit">
+                <FormattedMessage id="general.update" />
+              </Button>
+              <Button bsStyle="default" onClick={this.props.disableEdit}>
+                <FormattedMessage id="general.cancel" />
+              </Button>
+            </ButtonToolbar>
           </FormGroup>
         </form>
       </StyledInputEnabled>
@@ -399,7 +402,7 @@ InputEnabled.propTypes = {
 };
 
 InputEnabled.defaultProps = {
-  forceRerender: () => (false)
-}
+  forceRerender: () => false
+};
 
 export default InputEnabled;