diff --git a/apps/remix-ide-e2e/src/commands/noWorkerErrorFor.ts b/apps/remix-ide-e2e/src/commands/noWorkerErrorFor.ts
index c9364c2552..08bea75d61 100644
--- a/apps/remix-ide-e2e/src/commands/noWorkerErrorFor.ts
+++ b/apps/remix-ide-e2e/src/commands/noWorkerErrorFor.ts
@@ -16,6 +16,7 @@ class NoWorkerErrorFor extends EventEmitter {
 function noWorkerErrorFor (browser: NightwatchBrowser, version: string, callback: VoidFunction) {
   browser
     .setSolidityCompilerVersion(version)
+    .waitForElementVisible('*[data-id="compilerContainerCompileBtn"]')
     .click('*[data-id="compilerContainerCompileBtn"]')
     .waitForElementPresent('*[data-id="compilationFinishedWith_' + version + '"]', 60000)
     .notContainsText('*[data-id="compiledErrors"]', `Worker error: Uncaught NetworkError: Failed to execute 'importScripts' on 'WorkerGlobalScope': The script at 'https://binaries.soliditylang.org/wasm/${version}' failed to load.`)
diff --git a/apps/remix-ide-e2e/src/commands/setSolidityCompilerVersion.ts b/apps/remix-ide-e2e/src/commands/setSolidityCompilerVersion.ts
index eb4c1b8a9f..2759ec4180 100644
--- a/apps/remix-ide-e2e/src/commands/setSolidityCompilerVersion.ts
+++ b/apps/remix-ide-e2e/src/commands/setSolidityCompilerVersion.ts
@@ -14,6 +14,11 @@ class SetSolidityCompilerVersion extends EventEmitter {
       })
       .waitForElementVisible(`[data-id="dropdown-item-${version}"]`)
       .click(`[data-id="dropdown-item-${version}"]`)
+      .waitForElementPresent({
+        selector: `//*[@data-id='compilerloaded' and @data-version='${version}']`,
+        locateStrategy: 'xpath',
+        timeout: 120000
+      })
       .perform(() => {
         this.emit('complete')
       })