diff --git a/source/main/modules/window-manager/index.ts b/source/main/modules/window-manager/index.ts
index 9ee86dfbd3..23292ca8b4 100644
--- a/source/main/modules/window-manager/index.ts
+++ b/source/main/modules/window-manager/index.ts
@@ -315,7 +315,10 @@ export default class WindowManager {
     }
 
     this._mainWindow.on('show', () => {
-      this._addTray()
+      const leaveAppRunning = Boolean(global.config.get('system.leaveAppRunning'))
+      if (leaveAppRunning) {
+        this._addTray()
+      }
     })
 
     // Listens to events from the window
diff --git a/source/win-preferences/schema/advanced.js b/source/win-preferences/schema/advanced.js
index 1ce5595e9d..e87f8391a7 100644
--- a/source/win-preferences/schema/advanced.js
+++ b/source/win-preferences/schema/advanced.js
@@ -38,7 +38,7 @@ export default {
       },
       {
         type: 'checkbox',
-        label: 'Leave app running in the notification area', // trans('dialog.preferences.leave_app_running'),
+        label: process.platform === 'darwin' ? 'Show app in the notification area' : 'Leave app running in the notification area',
         model: 'system.leaveAppRunning'
       }
     ],