From f112c4fdd8407f757e627ce609479a042c24ac3a Mon Sep 17 00:00:00 2001
From: Bijin A B <bijin@usebruno.com>
Date: Fri, 3 Apr 2026 13:55:12 +0530
Subject: [PATCH] fix: sample collection creation race condition (#7665)

---
 packages/bruno-electron/src/app/onboarding.js | 6 +++---
 packages/bruno-electron/src/ipc/workspace.js  | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/bruno-electron/src/app/onboarding.js b/packages/bruno-electron/src/app/onboarding.js
index c048a7550..43067df37 100644
--- a/packages/bruno-electron/src/app/onboarding.js
+++ b/packages/bruno-electron/src/app/onboarding.js
@@ -7,9 +7,9 @@ const { resolveDefaultLocation } = require('../utils/default-location');
 
 let pendingSampleCollection = null;
 
-// When renderer is ready, send any pending collection-opened event
-// This ensures the sample collection appears in the sidebar after onboarding
-ipcMain.on('main:renderer-ready', (mainWindow) => {
+// When workspaces are ready, send any pending collection-opened event
+// This ensures the sample collection appears in the sidebar after the workspace exists
+ipcMain.on('main:workspaces-ready', (mainWindow) => {
   if (pendingSampleCollection) {
     const { mainWindow: win, collectionPath, uid, brunoConfig } = pendingSampleCollection;
     win.webContents.send('main:collection-opened', collectionPath, uid, brunoConfig);
diff --git a/packages/bruno-electron/src/ipc/workspace.js b/packages/bruno-electron/src/ipc/workspace.js
index 342d93ce1..1b5a2551c 100644
--- a/packages/bruno-electron/src/ipc/workspace.js
+++ b/packages/bruno-electron/src/ipc/workspace.js
@@ -702,6 +702,8 @@ const registerWorkspaceIpc = (mainWindow, workspaceWatcher) => {
     } catch (error) {
       console.error('Error initializing workspaces:', error);
     }
+
+    ipcMain.emit('main:workspaces-ready', win);
   });
 };