diff --git a/web/src/js/components/Modal/OptionModal.jsx b/web/src/js/components/Modal/OptionModal.jsx
index 82ef83501..fed0048d7 100644
--- a/web/src/js/components/Modal/OptionModal.jsx
+++ b/web/src/js/components/Modal/OptionModal.jsx
@@ -53,7 +53,7 @@ class PureOptionModal extends Component {
     }
 
     componentWillUnmount(){
-        this.props.save()
+        // this.props.save()
     }
 
     render() {
diff --git a/web/src/js/components/common/Button.jsx b/web/src/js/components/common/Button.jsx
index e02ae0105..02dab3051 100644
--- a/web/src/js/components/common/Button.jsx
+++ b/web/src/js/components/common/Button.jsx
@@ -12,7 +12,7 @@ Button.propTypes = {
 export default function Button({ onClick, children, icon, disabled, className, title }) {
     return (
         <div className={classnames(className, 'btn btn-default')}
-             onClick={!disabled && onClick}
+             onClick={disabled ? undefined : onClick}
              disabled={disabled}
              title={title}>
             {icon && (<i className={"fa fa-fw " + icon}/> )}