diff --git a/src/browser/components/SettingsPage.jsx b/src/browser/components/SettingsPage.jsx
index 0eaeeb2d..08f3e341 100644
--- a/src/browser/components/SettingsPage.jsx
+++ b/src/browser/components/SettingsPage.jsx
@@ -123,9 +123,7 @@ const SettingsPage = React.createClass({
     });
   },
   handleChangeMinimizeToTray() {
-    var shouldMinimizeToTray =
-      (process.platform !== 'darwin' || !this.refs.showTrayIcon.props.checked) &&
-      !this.refs.minimizeToTray.props.checked;
+    const shouldMinimizeToTray = this.state.showTrayIcon && !this.refs.minimizeToTray.props.checked;
 
     this.setState({
       minimizeToTray: shouldMinimizeToTray
diff --git a/src/common/settings.js b/src/common/settings.js
index ac2abf5a..f3905889 100644
--- a/src/common/settings.js
+++ b/src/common/settings.js
@@ -20,6 +20,7 @@ function loadDefault(version) {
       showTrayIcon: false,
       trayIconTheme: '',
       disablewebsecurity: true,
+      minimizeToTray: false,
       toggleWindowOnTrayIconClick: false,
       version: 1,
       notifications: {