diff --git a/app/lib/app.ts b/app/lib/app.ts
index a6c8f682..75a288c8 100644
--- a/app/lib/app.ts
+++ b/app/lib/app.ts
@@ -183,7 +183,7 @@ export class Application {
     }
 
     enableTray (): void {
-        if (!!this.tray || process.platform === 'linux') {
+        if (!!this.tray || process.platform === 'linux' || this.configStore.showTray === false) {
             return
         }
         if (process.platform === 'darwin') {
diff --git a/locale/en-GB.po b/locale/en-GB.po
index 7bb588af..752421d9 100644
--- a/locale/en-GB.po
+++ b/locale/en-GB.po
@@ -2036,6 +2036,10 @@ msgstr ""
 msgid "Show Serial connections"
 msgstr ""
 
+#: locale/tmp-html/tabby-settings/src/components/settingsTab.component.html:73
+msgid "Show Tabby in tray or menu bar."
+msgstr ""
+
 #: locale/tmp-html/tabby-settings/src/components/windowSettingsTab.component.html:152
 msgid "Show tabs in fullscreen mode"
 msgstr ""
@@ -2044,6 +2048,10 @@ msgstr ""
 msgid "Show toolbar"
 msgstr ""
 
+#: locale/tmp-html/tabby-settings/src/components/settingsTab.component.html:73
+msgid "Show tray"
+msgstr ""
+
 #: locale/tmp-html/tabby-settings/src/components/vaultSettingsTab.component.html:45
 msgid "Show vault contents"
 msgstr ""
diff --git a/tabby-core/src/configDefaults.yaml b/tabby-core/src/configDefaults.yaml
index 6c1fc36a..9b6244db 100644
--- a/tabby-core/src/configDefaults.yaml
+++ b/tabby-core/src/configDefaults.yaml
@@ -43,6 +43,7 @@ enableWelcomeTab: true
 electronFlags:
   - ['force_discrete_gpu', '0']
 enableAutomaticUpdates: true
+showTray: true
 version: 1
 vault: null
 encrypted: false
diff --git a/tabby-settings/src/components/settingsTab.component.pug b/tabby-settings/src/components/settingsTab.component.pug
index e923d29f..19b1a5fb 100644
--- a/tabby-settings/src/components/settingsTab.component.pug
+++ b/tabby-settings/src/components/settingsTab.component.pug
@@ -100,6 +100,15 @@
                             .description(translate) Enable automatic installation of updates when they become available.
                         toggle([(ngModel)]='config.store.enableAutomaticUpdates', (ngModelChange)='saveConfiguration()')
 
+                    .form-line(*ngIf='hostApp.platform !== Platform.Web')
+                        .header
+                            .title(translate) Show tray
+                            .description(translate) Show Tabby in tray or menu bar.
+                        toggle(
+                            [(ngModel)]='config.store.showTray',
+                            (ngModelChange)='saveConfiguration(true)'
+                        )
+
                     .form-line(*ngIf='hostApp.platform !== Platform.Web')
                         .header
                             .title(translate) Debugging