diff --git a/src/main/menus/tray.js b/src/main/menus/tray.js
index 2ac3ef4f..9a5d7786 100644
--- a/src/main/menus/tray.js
+++ b/src/main/menus/tray.js
@@ -24,10 +24,15 @@ function createTemplate(mainWindow, config) {
     }), {
       type: 'separator'
     }, {
-      label: 'Settings',
+      label: process.platform !== 'darwin' ? 'Settings' : 'Preferences...',
       click: () => {
         mainWindow.loadURL('file://' + __dirname + '/browser/settings.html');
         showOrRestore(mainWindow);
+
+        if (process.platform === 'darwin') {
+          app.dock.show();
+          mainWindow.focus();
+        }
       }
     }, {
       type: 'separator'