diff --git a/apps/remix-ide-e2e/src/commands/openFile.ts b/apps/remix-ide-e2e/src/commands/openFile.ts
index baf0a89ea2..28d09a009d 100644
--- a/apps/remix-ide-e2e/src/commands/openFile.ts
+++ b/apps/remix-ide-e2e/src/commands/openFile.ts
@@ -15,7 +15,14 @@ class OpenFile extends EventEmitter {
 
 // click on fileExplorer can toggle it. We go through settings to be sure FE is open
 function openFile (browser: NightwatchBrowser, name: string, done: VoidFunction) {
-  browser.clickLaunchIcon('settings').pause(500).clickLaunchIcon('filePanel')
+  browser.perform((done) => {
+    browser.element('css selector', '[data-id="verticalIconsKindfilePanel"] img[data-id="selected"]', (result) => {
+            console.log(result)
+            if (result.status === 0) {
+                browser.clickLaunchIcon('filePanel').perform(done)
+            } else done()
+        })
+    })  
     .waitForElementVisible('li[data-id="treeViewLitreeViewItem' + name + '"', 60000)
     .click('li[data-id="treeViewLitreeViewItem' + name + '"')
     .pause(2000)
diff --git a/apps/remix-ide-e2e/src/tests/stressEditor.test.ts b/apps/remix-ide-e2e/src/tests/stressEditor.test.ts
index 43561b5f1e..ed0382bcb7 100644
--- a/apps/remix-ide-e2e/src/tests/stressEditor.test.ts
+++ b/apps/remix-ide-e2e/src/tests/stressEditor.test.ts
@@ -15,7 +15,6 @@ module.exports = {
       const name = 'test_' + i + '.sol'
       browser
         .openFile(name)
-        .pause(500)
         .getEditorValue((content) => {
           browser.assert.ok(content === contents[i])
           browser.assert.ok(content === contents[i])
diff --git a/libs/remix-ui/vertical-icons-panel/src/lib/components/Icon.tsx b/libs/remix-ui/vertical-icons-panel/src/lib/components/Icon.tsx
index a0aa750e73..95764db278 100644
--- a/libs/remix-ui/vertical-icons-panel/src/lib/components/Icon.tsx
+++ b/libs/remix-ui/vertical-icons-panel/src/lib/components/Icon.tsx
@@ -100,7 +100,7 @@ const Icon = ({
         id={`verticalIconsKind${name}`}
         ref={iconRef}
       >
-        <img className={`${theme === 'dark' ? 'invert' : ''} ${theme} remixui_image ${iconRecord.active ? `selected-${theme}`:''}`} src={icon} alt={name} />
+        <img data-id={iconRecord.active ? `selected`: ''} className={`${theme === 'dark' ? 'invert' : ''} ${theme} remixui_image ${iconRecord.active ? `selected-${theme}`:''}`} src={icon} alt={name} />
           <Badge
             badgeStatus={badgeStatus}
           />