diff --git a/src/components/tw-settings-modal/settings-modal.css b/src/components/tw-settings-modal/settings-modal.css
index 921fe22b9..c3d9edef0 100644
--- a/src/components/tw-settings-modal/settings-modal.css
+++ b/src/components/tw-settings-modal/settings-modal.css
@@ -16,13 +16,6 @@
     background: $ui-primary;
 }
 
-.disabled {
-    pointer-events: none;
-}
-.disabled > * {
-    opacity: 0.8;
-}
-
 .setting {
     display: flex;
     flex-direction: column;
diff --git a/src/components/tw-settings-modal/settings-modal.jsx b/src/components/tw-settings-modal/settings-modal.jsx
index 79eb9277f..cbcbd7b55 100644
--- a/src/components/tw-settings-modal/settings-modal.jsx
+++ b/src/components/tw-settings-modal/settings-modal.jsx
@@ -363,7 +363,7 @@ const SettingsModalComponent = props => (
         contentLabel={props.intl.formatMessage(messages.title)}
         id="settingsModal"
     >
-        <Box className={classNames(styles.body, {[styles.disabled]: props.disabled})}>
+        <Box className={styles.body}>
             <Header>
                 <FormattedMessage
                     defaultMessage="Featured"
@@ -429,7 +429,6 @@ SettingsModalComponent.propTypes = {
     intl: intlShape,
     onClose: PropTypes.func,
     reloadRequired: PropTypes.bool,
-    disabled: PropTypes.bool,
     framerate: PropTypes.number,
     onFramerateChange: PropTypes.func,
     onCustomizeFramerate: PropTypes.func,
diff --git a/src/containers/tw-settings-modal.jsx b/src/containers/tw-settings-modal.jsx
index 01a1b5498..98d20fc8b 100644
--- a/src/containers/tw-settings-modal.jsx
+++ b/src/containers/tw-settings-modal.jsx
@@ -42,21 +42,14 @@ class UsernameModal extends React.Component {
         this.state = {
             stageWidth: twStageSize.width,
             stageHeight: twStageSize.height,
-            reloadRequired: false,
-            isReloading: false
+            reloadRequired: false
         };
     }
     handleClose () {
-        if (this.state.isReloading) {
-            return;
-        }
         if (this.state.reloadRequired) {
             // eslint-disable-next-line no-alert
             if (confirm(this.props.intl.formatMessage(messages.confirmReload))) {
                 this.applyChangesThatNeedReload();
-                this.setState({
-                    isReloading: true
-                });
                 return;
             }
         }
@@ -137,7 +130,6 @@ class UsernameModal extends React.Component {
         return (
             <SettingsModalComponent
                 onClose={this.handleClose}
-                disabled={this.state.isReloading}
                 reloadRequired={this.state.reloadRequired}
                 onFramerateChange={this.handleFramerateChange}
                 onCustomizeFramerate={this.handleCustomizeFramerate}