diff --git a/src/components/modals/settings/Checkbox.jsx b/src/components/modals/settings/Checkbox.jsx
index ecfb581b..6262367a 100644
--- a/src/components/modals/settings/Checkbox.jsx
+++ b/src/components/modals/settings/Checkbox.jsx
@@ -7,26 +7,24 @@ export default class Checkbox extends React.PureComponent {
   constructor(...args) {
     super(...args);
     this.state = {
-        checked: true
+      checked: true
     }
   }
 
+  handleChange(name) {
+    SettingsFunctions.setItem(name);
+    this.setState({ checked: (this.state.checked === true) ? false : true });
+  }
+
+  componentDidMount() {
+    this.setState({ checked: (localStorage.getItem(this.props.name) === 'true') });
+  }
+
   render() {
-    const handleChange = () => {
-      SettingsFunctions.setItem(this.props.name);
-      let checked;
-      if (this.state.checked === true) checked = false;
-      else checked = true;
-      this.setState({ checked: checked });
-    }
-
-    let value = localStorage.getItem(this.props.name);
-    this.setState({ checked: (value === 'true') });
-
     return (
       <React.Fragment>
         <FormControlLabel
-          control={<CheckboxUI name="checkedB" color="primary" checked={this.state.checked} onChange={handleChange} />}
+          control={<CheckboxUI name='checkedB' color='primary' checked={this.state.checked} onChange={() => this.handleChange(this.props.name)} />}
           label={this.props.text}
         />
         <br/>