diff --git a/apps/client/src/features/modals/sheets-modal/SheetsModal.tsx b/apps/client/src/features/modals/sheets-modal/SheetsModal.tsx
index e35521c8f..97f2a15e5 100644
--- a/apps/client/src/features/modals/sheets-modal/SheetsModal.tsx
+++ b/apps/client/src/features/modals/sheets-modal/SheetsModal.tsx
@@ -31,6 +31,7 @@ import {
 } from '../../../common/api/ontimeApi';
 import { projectDataPlaceholder } from '../../../common/models/ProjectData';
 import { userFieldsPlaceholder } from '../../../common/models/UserFields';
+import { openLink } from '../../../common/utils/linkUtils';
 import ModalLink from '../ModalLink';
 import PreviewExcel from '../upload-modal/preview/PreviewExcel';
 
@@ -101,8 +102,15 @@ export default function SheetsModal(props: SheetsModalProps) {
   const handleAuthenticate = () => {
     getSheetsAuthUrl().then((data) => {
       if (data !== 'bad') {
-        window.open(data, '_blank', 'noreferrer');
-        //TODO: can we detect when this window is closed
+        openLink(data);
+        window.addEventListener(
+          'focus',
+          () =>
+            getSheetState(sheetRef.current?.value ?? '', worksheetRef.current?.value ?? '').then((data) =>
+              setState(data),
+            ),
+          { once: true },
+        );
       }
     });
   };
diff --git a/apps/electron/main.js b/apps/electron/main.js
index 8472260f8..80d9a8025 100644
--- a/apps/electron/main.js
+++ b/apps/electron/main.js
@@ -138,11 +138,6 @@ function createWindow() {
   });
 
   win.setMenu(null);
-
-  win.webContents.setWindowOpenHandler(({ url }) => {
-    shell.openExternal(url);
-    return { action: 'deny' };
-  });
 }
 
 app.disableHardwareAcceleration();