diff --git a/apps/remix-ide-e2e/src/tests/solidityUnittests.spec.ts b/apps/remix-ide-e2e/src/tests/solidityUnittests.spec.ts
index ecca5ba621..5b4dc8876f 100644
--- a/apps/remix-ide-e2e/src/tests/solidityUnittests.spec.ts
+++ b/apps/remix-ide-e2e/src/tests/solidityUnittests.spec.ts
@@ -167,6 +167,12 @@ module.exports = {
       .execute(function () { document.querySelector('*[data-id="modalDialogCustomPromptTextCreate"]')['value'] = 'workspace_new' })
       .waitForElementVisible('*[data-id="fileSystem-modal-footer-ok-react"]')
       .click('*[data-id="fileSystem-modal-footer-ok-react"]')
+      .getLog('browser', function (logEntriesArray) {
+        console.log('Log length: ' + logEntriesArray.length)
+        logEntriesArray.forEach(function (log) {
+          console.log('[' + log.level + '] ' + log.timestamp + ' : ' + log.message)
+        })
+      })
       .waitForElementPresent('*[data-id="workspacesSelect"] option[value="workspace_new"]')
       // end of creating
       .clickLaunchIcon('solidityUnitTesting')
diff --git a/libs/remix-ui/workspace/src/lib/actions/workspace.ts b/libs/remix-ui/workspace/src/lib/actions/workspace.ts
index 6fc8b1118a..c99ea9f601 100644
--- a/libs/remix-ui/workspace/src/lib/actions/workspace.ts
+++ b/libs/remix-ui/workspace/src/lib/actions/workspace.ts
@@ -185,7 +185,6 @@ export const renameWorkspaceFromProvider = async (oldName: string, workspaceName
   const workspacesPath = workspaceProvider.workspacesPath
   browserProvider.rename('browser/' + workspacesPath + '/' + oldName, 'browser/' + workspacesPath + '/' + workspaceName, true)
   workspaceProvider.setWorkspace(workspaceName)
-  plugin.emit('renameWorkspace', { name: workspaceName })
   plugin.setWorkspaces(await getWorkspaces())
 }
 
diff --git a/libs/remix-ui/workspace/src/lib/reducers/workspace.ts b/libs/remix-ui/workspace/src/lib/reducers/workspace.ts
index 0d968cf54a..225af4eff5 100644
--- a/libs/remix-ui/workspace/src/lib/reducers/workspace.ts
+++ b/libs/remix-ui/workspace/src/lib/reducers/workspace.ts
@@ -450,7 +450,8 @@ export const browserReducer = (state = browserInitialState, action: Action) => {
         browser: {
           ...state.browser,
           currentWorkspace: payload.workspaceName,
-          workspaces: [...workspaces, payload.workspaceName]
+          workspaces: [...workspaces, payload.workspaceName],
+          expandPath: []
         }
       }
     }