Propagate new WindowController to TrayIconController

3 files changed, 8 insertions, 0 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 498601fd39..1d8683a32c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -46,6 +46,9 @@ Line wrap the file at 100 chars.                                              Th
 - Fix scrollbar no longer responsive and usable when covered by other elements.
 - Improve tunnel bypass for the API sometimes not working in the connecting state.
 
+#### Windows
+- Fix "Open Mullvad VPN" tray context menu item not working after toggling unpinned window setting.
+
 ### Security
 #### Android
 - Prevent location request responses from being received outside the tunnel when in the connected
diff --git a/gui/src/main/index.ts b/gui/src/main/index.ts
index bb84d520fe..8cebf9511b 100644
--- a/gui/src/main/index.ts
+++ b/gui/src/main/index.ts
@@ -594,6 +594,7 @@ class ApplicationMain {
 
       this.installWindowCloseHandler(this.windowController);
       this.installTrayClickHandlers();
+      this.trayIconController?.setWindowController(this.windowController);
 
       const filePath = path.resolve(path.join(__dirname, '../renderer/index.html'));
       try {
diff --git a/gui/src/main/tray-icon-controller.ts b/gui/src/main/tray-icon-controller.ts
index 9890eba8ff..f1028bd11c 100644
--- a/gui/src/main/tray-icon-controller.ts
+++ b/gui/src/main/tray-icon-controller.ts
@@ -45,6 +45,10 @@ export default class TrayIconController {
     }
   }
 
+  public setWindowController(windowController: WindowController) {
+    this.windowController = windowController;
+  }
+
   get iconType(): TrayIconType {
     return this.iconTypeValue;
   }