diff --git a/src/app/files/file-explorer.js b/src/app/files/file-explorer.js
index 25e0346cbc..2d12bd8dce 100644
--- a/src/app/files/file-explorer.js
+++ b/src/app/files/file-explorer.js
@@ -104,8 +104,8 @@ function fileExplorer (localRegistry, files, menuItems) {
     self.ensureRoot(() => {
       const folderpath = filepath.split('/').slice(0, -1).join('/')
       const currentTree = self.treeView.nodeAt(folderpath)
-
-      if (currentTree && self.treeView.isExpanded(folderpath)) {
+      if (!self.treeView.isExpanded(folderpath)) self.treeView.expand(folderpath)
+      if (currentTree) {
         self.files.resolveDirectory(folderpath, (error, fileTree) => {
           if (error) console.error(error)
           if (!fileTree) return
@@ -136,7 +136,7 @@ function fileExplorer (localRegistry, files, menuItems) {
         if (!fileTree) return
         fileTree = normalize(folderpath, fileTree)
         self.treeView.updateNodeFromJSON(folderpath, fileTree, true)
-        self.treeview.expand(folderpath)
+        if (!self.treeView.isExpanded(folderpath)) self.treeView.expand(folderpath)
       })
     })
   }
diff --git a/src/app/tabs/test-tab.js b/src/app/tabs/test-tab.js
index 943ba29978..b0e3c24297 100644
--- a/src/app/tabs/test-tab.js
+++ b/src/app/tabs/test-tab.js
@@ -494,10 +494,11 @@ module.exports = class TestTab extends ViewPlugin {
     this.testsExecutionStopped = yo`<label class="text-warning h6" data-id="testTabTestsExecutionStopped">The test execution has been stopped</label>`
     this.testsExecutionStoppedError = yo`<label class="text-danger h6" data-id="testTabTestsExecutionStoppedError">The test execution has been stopped because of error(s) in your test file</label>`
     this.uiPathList = yo`<datalist id="utPathList"></datalist>`
+    const placeHolderPath = 'browser/tests'
     const availablePaths = yo`
       <div>
         <input
-          placeholder="browser/tests"
+          placeholder=${placeHolderPath}
           list="utPathList"
           class="custom-select"
           id="utPath"
@@ -544,6 +545,7 @@ module.exports = class TestTab extends ViewPlugin {
       </div>
     `
     this._view.el = el
+    this.testTabLogic.setCurrentPath(placeHolderPath)
     this.updateForNewCurrent(this.fileManager.currentFile())
     return el
   }
diff --git a/test-browser/tests/fileExplorer.test.js b/test-browser/tests/fileExplorer.test.js
index c39fb9ff04..9647c93d08 100644
--- a/test-browser/tests/fileExplorer.test.js
+++ b/test-browser/tests/fileExplorer.test.js
@@ -22,8 +22,7 @@ module.exports = {
     .waitForElementVisible('*[data-id="modalDialogContainer"]')
     .setValue('*[data-id="modalDialogCustomPromptText"]', '5_New_contract.sol')
     .modalFooterOKClick()
-    .pause(2000)
-    .waitForElementVisible('*[data-id="treeViewLibrowser/5_New_contract.sol"]')
+    .waitForElementVisible('*[data-id="treeViewLibrowser/5_New_contract.sol"]', 7000)
   },
 
   'Should rename `5_New_contract.sol` to 5_Renamed_Contract.sol': function (browser) {
@@ -86,8 +85,7 @@ module.exports = {
     .click('*[data-id="fileExplorerNewFilepublishToGist"]')
     .waitForElementVisible('*[data-id="modalDialogContainer"]')
     .modalFooterOKClick()
-    .pause(10000)
-    .waitForElementVisible('*[data-id="modalDialogContainer"]')
+    .waitForElementVisible('*[data-id="modalDialogContainer"]', 7000)
     .modalFooterOKClick()
     .pause(2000)
     .perform((done) => {
diff --git a/test-browser/tests/generalSettings.test.js b/test-browser/tests/generalSettings.test.js
index ea9ab48c87..a47484a672 100644
--- a/test-browser/tests/generalSettings.test.js
+++ b/test-browser/tests/generalSettings.test.js
@@ -37,7 +37,6 @@ module.exports = {
     .click('*[data-id="compilerContainerCompileBtn"]')
     .pause(3000)
     .click('*[data-id="verticalIconsKindfileExplorers"]')
-    .openFile('browser/artifacts')
     .openFile('browser/artifacts/Ballot.json')
   },
 
diff --git a/test-browser/tests/gist.test.js b/test-browser/tests/gist.test.js
index 5c01f6f5a9..a939bcdc17 100644
--- a/test-browser/tests/gist.test.js
+++ b/test-browser/tests/gist.test.js
@@ -45,7 +45,6 @@ module.exports = {
           .modalFooterCancelClick()
           .executeScript(`remix.loadgist('${gistid}')`)
           .perform((done) => { if (runtimeBrowser === 'chrome') { browser.openFile('browser/gists') } done() })
-          .openFile(`browser/gists/${gistid}`)
           .openFile(`browser/gists/${gistid}/1_Storage.sol`)
           .perform(done)
       }
@@ -86,7 +85,6 @@ module.exports = {
     .waitForElementVisible('*[data-id="modalDialogCustomPromptText"]')
     .setValue('*[data-id="modalDialogCustomPromptText"]', testData.validGistId)
     .modalFooterOKClick()
-    .openFile(`browser/gists/${testData.validGistId}`)
     .openFile(`browser/gists/${testData.validGistId}/ApplicationRegistry`)
     .waitForElementVisible(`div[title='browser/gists/${testData.validGistId}/ApplicationRegistry']`)
     .assert.containsText(`div[title='browser/gists/${testData.validGistId}/ApplicationRegistry'] > span`, 'ApplicationRegistry')