diff --git a/electron/main/index.ts b/electron/main/index.ts
index d8556cfc9..5faa56f80 100644
--- a/electron/main/index.ts
+++ b/electron/main/index.ts
@@ -171,7 +171,17 @@ async function initialize(): Promise<void> {
 }
 
 // Application lifecycle
-app.whenReady().then(initialize);
+app.whenReady().then(() => {
+  initialize();
+
+  // Register activate handler AFTER app is ready to prevent
+  // "Cannot create BrowserWindow before app is ready" on macOS.
+  app.on('activate', () => {
+    if (BrowserWindow.getAllWindows().length === 0) {
+      mainWindow = createWindow();
+    }
+  });
+});
 
 app.on('window-all-closed', () => {
   if (process.platform !== 'darwin') {
@@ -179,12 +189,6 @@ app.on('window-all-closed', () => {
   }
 });
 
-app.on('activate', () => {
-  if (BrowserWindow.getAllWindows().length === 0) {
-    mainWindow = createWindow();
-  }
-});
-
 app.on('before-quit', async () => {
   await gatewayManager.stop();
 });