diff --git a/apps/remix-ide-e2e/src/tests/url.test.ts b/apps/remix-ide-e2e/src/tests/url.test.ts
index 6066dd59eb..ff77e1f838 100644
--- a/apps/remix-ide-e2e/src/tests/url.test.ts
+++ b/apps/remix-ide-e2e/src/tests/url.test.ts
@@ -98,8 +98,6 @@ module.exports = {
       .pause(7000)
       .currentWorkspaceIs('code-sample')
       .waitForElementVisible('*[data-id=treeViewLitreeViewItemmainnet]')
-      .click('*[data-id=treeViewLitreeViewItemmainnet]')
-      .click('*[data-id=treeViewLitreeViewItemmainnet]')
       .waitForElementVisible('*[data-id="treeViewLitreeViewItemmainnet/0xdac17f958d2ee523a2206206994597c13d831ec7"]')
       .click('*[data-id="treeViewLitreeViewItemmainnet/0xdac17f958d2ee523a2206206994597c13d831ec7"]')
       .waitForElementVisible('*[data-id="treeViewLitreeViewItemmainnet/0xdac17f958d2ee523a2206206994597c13d831ec7/TetherToken.sol"]')
diff --git a/libs/remix-ui/workspace/src/lib/actions/index.ts b/libs/remix-ui/workspace/src/lib/actions/index.ts
index 11daf3323d..61eed32122 100644
--- a/libs/remix-ui/workspace/src/lib/actions/index.ts
+++ b/libs/remix-ui/workspace/src/lib/actions/index.ts
@@ -54,7 +54,11 @@ export const initWorkspace = (filePanelPlugin) => async (reducerDispatch: React.
     const localhostProvider = filePanelPlugin.fileProviders.localhost
     const electrOnProvider = filePanelPlugin.fileProviders.electron
     const params = queryParams.get() as UrlParametersType
+    let editorMounted = false
     let workspaces = []
+    plugin.on('editor', 'editorMounted', async () => {
+      editorMounted = true
+    })
     if (!(Registry.getInstance().get('platform').api.isDesktop())) {
       workspaces = await getWorkspaces() || []
       dispatch(setWorkspaces(workspaces))
@@ -69,7 +73,14 @@ export const initWorkspace = (filePanelPlugin) => async (reducerDispatch: React.
       plugin.setWorkspace({ name: 'code-sample', isLocalhost: false })
       dispatch(setCurrentWorkspace({ name: 'code-sample', isGitRepo: false }))
       const filePath = await loadWorkspacePreset('code-template')
-      plugin.on('editor', 'editorMounted', async () => await plugin.fileManager.openFile(filePath))
+      plugin.on('filePanel', 'workspaceInitializationCompleted', async () => {            
+        if (editorMounted){
+          setTimeout(async () => {
+            await plugin.fileManager.openFile(filePath)}, 2000)
+        }else{
+          plugin.on('editor', 'editorMounted', async () => await plugin.fileManager.openFile(filePath))
+        }
+      })
     } else if (params.address) {
       if (params.address.startsWith('0x') && params.address.length === 42) {
         const contractAddress = params.address
@@ -112,7 +123,15 @@ export const initWorkspace = (filePanelPlugin) => async (reducerDispatch: React.
             for (filePath in data.compilationTargets)
               await workspaceProvider.set(filePath, data.compilationTargets[filePath]['content'])
           }
-          plugin.on('editor', 'editorMounted', async () => await plugin.fileManager.openFile(filePath))
+
+          plugin.on('filePanel', 'workspaceInitializationCompleted', async () => {            
+            if (editorMounted){
+              setTimeout(async () => {
+                await plugin.fileManager.openFile(filePath)}, 2000)
+            }else{
+              plugin.on('editor', 'editorMounted', async () => await plugin.fileManager.openFile(filePath))
+            }
+          })
           plugin.call('notification', 'toast', `Added ${count} verified contract${count === 1 ? '' : 's'} from ${foundOnNetworks.join(',')} network${foundOnNetworks.length === 1 ? '' : 's'} of Etherscan for contract address ${contractAddress} !!`)
         } catch (error) {
           await basicWorkspaceInit(workspaces, workspaceProvider)