From 013c128c786ffad7ada96605af6a1d3b8ebf267f Mon Sep 17 00:00:00 2001
From: naman-bruno <naman@usebruno.com>
Date: Thu, 11 Dec 2025 17:24:33 +0530
Subject: [PATCH] fixes

---
 packages/bruno-electron/src/ipc/workspace.js | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/bruno-electron/src/ipc/workspace.js b/packages/bruno-electron/src/ipc/workspace.js
index 6cff3ff12..2af42de95 100644
--- a/packages/bruno-electron/src/ipc/workspace.js
+++ b/packages/bruno-electron/src/ipc/workspace.js
@@ -28,6 +28,16 @@ const {
 const registerWorkspaceIpc = (mainWindow, workspaceWatcher) => {
   const lastOpenedWorkspaces = new LastOpenedWorkspaces();
 
+  // Helper to get the correct workspace UID
+  // For default workspace, always use 'default', otherwise generate hash
+  const getWorkspaceUid = (workspacePath) => {
+    const defaultWorkspacePath = defaultWorkspaceManager.getDefaultWorkspacePath();
+    if (defaultWorkspacePath && path.normalize(workspacePath) === path.normalize(defaultWorkspacePath)) {
+      return defaultWorkspaceManager.getDefaultWorkspaceUid();
+    }
+    return generateUidBasedOnHash(workspacePath);
+  };
+
   ipcMain.handle('renderer:create-workspace',
     async (event, workspaceName, workspaceFolderName, workspaceLocation) => {
       try {
@@ -338,7 +348,7 @@ const registerWorkspaceIpc = (mainWindow, workspaceWatcher) => {
       const updatedCollections = await addCollectionToWorkspace(workspacePath, normalizedCollection);
 
       const workspaceConfig = readWorkspaceConfig(workspacePath);
-      const workspaceUid = generateUidBasedOnHash(workspacePath);
+      const workspaceUid = getWorkspaceUid(workspacePath);
       mainWindow.webContents.send('main:workspace-config-updated', workspacePath, workspaceUid, workspaceConfig);
 
       return updatedCollections;
@@ -379,7 +389,7 @@ const registerWorkspaceIpc = (mainWindow, workspaceWatcher) => {
         await fsExtra.remove(collectionPath);
       }
 
-      const correctWorkspaceUid = generateUidBasedOnHash(workspacePath);
+      const correctWorkspaceUid = getWorkspaceUid(workspacePath);
       mainWindow.webContents.send('main:workspace-config-updated', workspacePath, correctWorkspaceUid, result.updatedConfig);
 
       return true;