From a62eb6c0422dcb6e4bae60286328ffa572f0ade9 Mon Sep 17 00:00:00 2001
From: NguyenTranHoangSym <nguyen.tranhoang@symphony.com>
Date: Thu, 11 Jan 2024 16:24:39 +0700
Subject: [PATCH] SDA-4441: Restore focus on main after shifting

---
 src/app/window-handler.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/app/window-handler.ts b/src/app/window-handler.ts
index 5d5c7cd0..25bdc1eb 100644
--- a/src/app/window-handler.ts
+++ b/src/app/window-handler.ts
@@ -643,6 +643,8 @@ export class WindowHandler {
 
     // workaround for https://perzoinc.atlassian.net/browse/SDA-4251
     this.mainWindow?.on('focus', () => {
+      const mainView = this.getMainView();
+      mainView?.webContents.focus();
       if (
         this.mainWindow &&
         windowExists(this.mainWindow) &&