diff --git a/src/BasePlatform.js b/src/BasePlatform.js
index 79f0d69e2c..54310d1849 100644
--- a/src/BasePlatform.js
+++ b/src/BasePlatform.js
@@ -113,4 +113,29 @@ export default class BasePlatform {
     reload() {
         throw new Error("reload not implemented!");
     }
+
+    supportsAutoLaunch(): boolean {
+        return false;
+    }
+
+    // XXX: Surely this should be a setting like any other?
+    async getAutoLaunchEnabled(): boolean {
+        return false;
+    }
+
+    async setAutoLaunchEnabled(enabled: boolean): void {
+        throw new Error("Unimplemented");
+    }
+
+    supportsMinimizeToTray(): boolean {
+        return false;
+    }
+
+    async getMinimizeToTrayEnabled(): boolean {
+        return false;
+    }
+
+    async setMinimizeToTrayEnabled(enabled: boolean): void {
+        throw new Error("Unimplemented");
+    }
 }
diff --git a/src/components/views/settings/tabs/PreferencesSettingsTab.js b/src/components/views/settings/tabs/PreferencesSettingsTab.js
index d76dc8f3dd..b6273c5d47 100644
--- a/src/components/views/settings/tabs/PreferencesSettingsTab.js
+++ b/src/components/views/settings/tabs/PreferencesSettingsTab.js
@@ -59,24 +59,39 @@ export default class PreferencesSettingsTab extends React.Component {
         this.state = {
             autoLaunch: false,
             autoLaunchSupported: false,
+            minimizeToTray: true,
+            minimizeToTraySupported: false,
         };
     }
 
     async componentWillMount(): void {
-        const autoLaunchSupported = await PlatformPeg.get().supportsAutoLaunch();
+        const platform = PlatformPeg.get();
+
+        const autoLaunchSupported = await platform.supportsAutoLaunch();
         let autoLaunch = false;
 
         if (autoLaunchSupported) {
-            autoLaunch = await PlatformPeg.get().getAutoLaunchEnabled();
+            autoLaunch = await platform.getAutoLaunchEnabled();
         }
 
-        this.setState({autoLaunch, autoLaunchSupported});
+        const minimizeToTraySupported = await platform.supportsMinimizeToTray();
+        let minimizeToTray = true;
+
+        if (minimizeToTraySupported) {
+            minimizeToTray = await platform.getMinimizeToTrayEnabled();
+        }
+
+        this.setState({autoLaunch, autoLaunchSupported, minimizeToTraySupported, minimizeToTray});
     }
 
     _onAutoLaunchChange = (checked) => {
         PlatformPeg.get().setAutoLaunchEnabled(checked).then(() => this.setState({autoLaunch: checked}));
     };
 
+    _onMinimizeToTrayChange = (checked) => {
+        PlatformPeg.get().setMinimizeToTrayEnabled(checked).then(() => this.setState({minimizeToTray: checked}));
+    };
+
     _onAutocompleteDelayChange = (e) => {
         SettingsStore.setValue("autocompleteDelay", null, SettingLevel.DEVICE, e.target.value);
     };
@@ -93,6 +108,12 @@ export default class PreferencesSettingsTab extends React.Component {
                                                      onChange={this._onAutoLaunchChange}
                                                      label={_t('Start automatically after system login')} />;
         }
+        let minimizeToTrayOption = null;
+        if (this.state.minimizeToTraySupported) {
+            minimizeToTrayOption = <LabelledToggleSwitch value={this.state.minimizeToTray}
+                                                         onChange={this._onMinimizeToTrayChange}
+                                                         label={_t('Close button should minimize window to tray')} />;
+        }
 
         return (
             <div className="mx_SettingsTab mx_PreferencesSettingsTab">
@@ -106,6 +127,7 @@ export default class PreferencesSettingsTab extends React.Component {
 
                     <span className="mx_SettingsTab_subheading">{_t("Advanced")}</span>
                     {this._renderGroup(PreferencesSettingsTab.ADVANCED_SETTINGS)}
+                    {minimizeToTrayOption}
                     {autoLaunchOption}
                     <Field id={"autocompleteDelay"} label={_t('Autocomplete delay (ms)')} type='number'
                            value={SettingsStore.getValueAt(SettingLevel.DEVICE, 'autocompleteDelay')}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 84c9dacd07..0bc7b55484 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -551,6 +551,7 @@
     "Labs": "Labs",
     "Notifications": "Notifications",
     "Start automatically after system login": "Start automatically after system login",
+    "Close button should minimize window to tray": "Close button should minimize window to tray",
     "Preferences": "Preferences",
     "Composer": "Composer",
     "Timeline": "Timeline",