diff --git a/src/app/accounts/settings.component.html b/src/app/accounts/settings.component.html
index 5aa219203e..a20d8a65b7 100644
--- a/src/app/accounts/settings.component.html
+++ b/src/app/accounts/settings.component.html
@@ -52,6 +52,16 @@
                             </div>
                             <small class="help-block">{{'enableMinToTrayDesc' | i18n}}</small>
                         </div>
+                        <div class="form-group" *ngIf="showMinToTray">
+                            <div class="checkbox">
+                                <label for="enableCloseToTray">
+                                    <input id="enableCloseToTray" type="checkbox" name="EnableCloseToTray"
+                                           [(ngModel)]="enableCloseToTray" (change)="saveCloseToTray()">
+                                    {{'enableCloseToTray' | i18n}}
+                                </label>
+                            </div>
+                            <small class="help-block">{{'enableCloseToTrayDesc' | i18n}}</small>
+                        </div>
                         <div class="form-group">
                             <div class="checkbox">
                                 <label for="disableGa">
diff --git a/src/app/accounts/settings.component.ts b/src/app/accounts/settings.component.ts
index 64b90bdae1..87899192d8 100644
--- a/src/app/accounts/settings.component.ts
+++ b/src/app/accounts/settings.component.ts
@@ -30,6 +30,7 @@ export class SettingsComponent implements OnInit {
     disableGa: boolean = false;
     disableFavicons: boolean = false;
     enableMinToTray: boolean = false;
+    enableCloseToTray: boolean = false;
     enableTray: boolean = false;
     showMinToTray: boolean = false;
     locale: string;
@@ -78,6 +79,7 @@ export class SettingsComponent implements OnInit {
         this.lockOption = await this.storageService.get<number>(ConstantsService.lockOptionKey);
         this.disableFavicons = await this.storageService.get<boolean>(ConstantsService.disableFaviconKey);
         this.enableMinToTray = await this.storageService.get<boolean>(ElectronConstants.enableMinimizeToTrayKey);
+        this.enableCloseToTray = await this.storageService.get<boolean>(ElectronConstants.enableCloseToTrayKey);
         this.enableTray = await this.storageService.get<boolean>(ElectronConstants.enableTrayKey);
         this.locale = await this.storageService.get<string>(ConstantsService.localeKey);
         this.theme = await this.storageService.get<string>(ConstantsService.themeKey);
@@ -113,6 +115,11 @@ export class SettingsComponent implements OnInit {
         this.callAnalytics('MinimizeToTray', this.enableMinToTray);
     }
 
+    async saveCloseToTray() {
+        await this.storageService.save(ElectronConstants.enableCloseToTrayKey, this.enableCloseToTray);
+        this.callAnalytics('CloseToTray', this.enableCloseToTray);
+    }
+
     async saveTray() {
         await this.storageService.save(ElectronConstants.enableTrayKey, this.enableTray);
         this.callAnalytics('Tray', this.enableTray);
diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json
index 06748f1be6..a898db3c86 100644
--- a/src/locales/en/messages.json
+++ b/src/locales/en/messages.json
@@ -806,6 +806,12 @@
   "enableMinToTrayDesc": {
     "message": "When minimizing the window, show an icon in the system tray instead."
   },
+  "enableCloseToTray": {
+    "message": "Close to Tray Icon"
+  },
+  "enableCloseToTrayDesc": {
+    "message": "When closing the window, show an icon in the system tray instead."
+  },
   "enableTray": {
     "message": "Enable Tray Icon"
   },
diff --git a/src/main/menu.main.ts b/src/main/menu.main.ts
index c0008e72da..fc3792e763 100644
--- a/src/main/menu.main.ts
+++ b/src/main/menu.main.ts
@@ -367,6 +367,13 @@ export class MenuMain extends BaseMenu {
             },
         ];
 
+        const firstMenuOptionsWindowsLinux: MenuItemConstructorOptions[] = [
+            {
+                label: this.i18nService.t('quitBitwarden'),
+                role: 'quit',
+            },
+        ];
+
         const updateMenuItem = {
             label: this.main.i18nService.t('checkForUpdates'),
             click: () => this.main.updaterMain.checkForUpdate(true),
@@ -398,6 +405,10 @@ export class MenuMain extends BaseMenu {
             // File menu
             template[0].submenu = (template[0].submenu as MenuItemConstructorOptions[]).concat(
                 firstMenuOptions);
+            if(process.platform === 'linux' || process.platform === 'win32') {
+                template[0].submenu = (template[0].submenu as MenuItemConstructorOptions[]).concat(
+                    firstMenuOptionsWindowsLinux);
+            }
 
             // About menu
             const aboutMenuAdditions: MenuItemConstructorOptions[] = [