diff --git a/apps/remix-ide-e2e/src/commands/switchWorkspace.ts b/apps/remix-ide-e2e/src/commands/switchWorkspace.ts
index 558178b07d..f4d16b17f2 100644
--- a/apps/remix-ide-e2e/src/commands/switchWorkspace.ts
+++ b/apps/remix-ide-e2e/src/commands/switchWorkspace.ts
@@ -3,12 +3,13 @@ import EventEmitter from 'events'
 
 class switchWorkspace extends EventEmitter {
   command (this: NightwatchBrowser, workspaceName: string): NightwatchBrowser {
-    this.api.waitForElementVisible('[data-id="workspacesSelect"]')
+    this.api
+    .waitForElementVisible('[data-id="workspacesSelect"]')
+    .waitForElementPresent(`[data-id="dropdown-item-${workspaceName}"]`)
     .click('[data-id="workspacesSelect"]')
     .waitForElementVisible(`[data-id="dropdown-item-${workspaceName}"]`)
-    .pause(2000)
     .click(`[data-id="dropdown-item-${workspaceName}"]`)
-    .pause(3000)
+    .pause(4000)
     .perform((done) => {
       done()
       this.emit('complete')