diff --git a/apps/remix-ide-e2e/src/commands/selectContract.ts b/apps/remix-ide-e2e/src/commands/selectContract.ts
index d270f8949d..87bbc40c30 100644
--- a/apps/remix-ide-e2e/src/commands/selectContract.ts
+++ b/apps/remix-ide-e2e/src/commands/selectContract.ts
@@ -4,19 +4,14 @@ import EventEmitter from 'events'
 const selector = '.udapp_contractNames'
 
 class SelectContract extends EventEmitter {
-  command (this: NightwatchBrowser, contractName: string): NightwatchBrowser {
-    this.api.waitForElementVisible(selector).perform((done) => {
-      selectContract(this.api, contractName, () => {
-        done()
-        this.emit('complete')
-      })
-    })
+  command(this: NightwatchBrowser, contractName: string): NightwatchBrowser {
+    this.api
+      .waitForElementVisible(selector)
+      .waitForElementPresent(`${selector} option[value="${contractName}"]`)
+      .click(`${selector} option[value="${contractName}"]`)
+      .perform(() => this.emit('complete'))
     return this
   }
 }
 
-function selectContract (browser: NightwatchBrowser, contractName: string, callback: VoidFunction) {
-  browser.click(`${selector} option[value="${contractName}"]`).perform(() => callback())
-}
-
 module.exports = SelectContract
diff --git a/apps/remix-ide-e2e/src/tests/terminal.test.ts b/apps/remix-ide-e2e/src/tests/terminal.test.ts
index 8aa15f221c..77bb44f548 100644
--- a/apps/remix-ide-e2e/src/tests/terminal.test.ts
+++ b/apps/remix-ide-e2e/src/tests/terminal.test.ts
@@ -209,18 +209,16 @@ module.exports = {
       .createContract('')
       .getAddressAtPosition(0, (address) => {
         addressRef = address
-      })
-      .perform((done) => {
         browser.addFile('scripts/test_filtering_event.ts', { content: test_filtering_event.replace('<ADDRESS>', addressRef) })
-        .perform(() => done())
+          .executeScriptInTerminal('remix.execute(\'scripts/test_filtering_event.ts\')')
+          .pause(1000)
+          .waitForElementContainsText('*[data-id="terminalJournal"]', '1')
+          .waitForElementContainsText('*[data-id="terminalJournal"]', 'true')
+          .executeScriptInTerminal('remix.execute(\'scripts/test_filtering_event.ts\')') // re-emit the event
+          .waitForElementContainsText('*[data-id="terminalJournal"]', '2')
+          .waitForElementContainsText('*[data-id="terminalJournal"]', 'false')
       })
-      .executeScriptInTerminal('remix.execute(\'scripts/test_filtering_event.ts\')')
-      .pause(1000)
-      .waitForElementContainsText('*[data-id="terminalJournal"]', '1')
-      .waitForElementContainsText('*[data-id="terminalJournal"]', 'true')
-      .executeScriptInTerminal('remix.execute(\'scripts/test_filtering_event.ts\')') // re-emit the event
-      .waitForElementContainsText('*[data-id="terminalJournal"]', '2')
-      .waitForElementContainsText('*[data-id="terminalJournal"]', 'false')
+
   },
 
   'Should display auto-complete menu #group4': function (browser: NightwatchBrowser) {