diff --git a/src/components/modals/Marketplace.jsx b/src/components/modals/Marketplace.jsx
index 48a1e5c0..fb9b1b78 100644
--- a/src/components/modals/Marketplace.jsx
+++ b/src/components/modals/Marketplace.jsx
@@ -88,7 +88,7 @@ export default class Marketplace extends React.PureComponent {
             document.getElementById('item').style.display = 'block';
 
             let button = <button className='addToMue' onClick={() => this.install()}>{this.props.language.product.buttons.addtomue}</button>;
-            let installed = JSON.parse(localStorage.getItem('installed'));
+            const installed = JSON.parse(localStorage.getItem('installed'));
             if (installed.some(item => item.name === data)) button = <button className='removeFromMue' onClick={() => this.uninstall()}>{this.props.language.product.buttons.remove}</button>;
             this.setState({ button: button });
         } else {
diff --git a/src/components/modals/settings/Checkbox.jsx b/src/components/modals/settings/Checkbox.jsx
index 91b0007b..ecfb581b 100644
--- a/src/components/modals/settings/Checkbox.jsx
+++ b/src/components/modals/settings/Checkbox.jsx
@@ -7,24 +7,26 @@ export default class Checkbox extends React.PureComponent {
   constructor(...args) {
     super(...args);
     this.state = {
-      checked: true
+        checked: true
     }
   }
 
-  handleChange() {
-    SettingsFunctions.setItem(this.props.name);
-    this.setState({ checked: this.state.checked });
-  }
-
-  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={this.handleChange} />}
+          control={<CheckboxUI name="checkedB" color="primary" checked={this.state.checked} onChange={handleChange} />}
           label={this.props.text}
         />
         <br/>