diff --git a/apps/remix-ide-e2e/src/tests/workspace.test.ts b/apps/remix-ide-e2e/src/tests/workspace.test.ts
index dd6be3893b..f5e6aa73f5 100644
--- a/apps/remix-ide-e2e/src/tests/workspace.test.ts
+++ b/apps/remix-ide-e2e/src/tests/workspace.test.ts
@@ -52,31 +52,31 @@ module.exports = {
       .assert.elementPresent('*[data-id="treeViewLitreeViewItemscripts/deploy_with_web3.ts"]')
       // check js and ts files are not transformed
       .click('*[data-id="treeViewLitreeViewItemscripts/deploy_with_web3.ts"]')
-      
+
       .getEditorValue((content) => {
         browser.assert.ok(content.indexOf(`import { deploy } from './web3-lib'`) !== -1,
-        'Incorrect content')
+          'Incorrect content')
       })
       .assert.elementPresent('*[data-id="treeViewLitreeViewItemscripts/deploy_with_ethers.ts"]')
       .click('*[data-id="treeViewLitreeViewItemscripts/deploy_with_ethers.ts"]')
       .pause(100)
       .getEditorValue((content) => {
         browser.assert.ok(content.indexOf(`import { deploy } from './ethers-lib'`) !== -1,
-        'Incorrect content')
+          'Incorrect content')
       })
       .assert.elementPresent('*[data-id="treeViewLitreeViewItemscripts/web3-lib.ts"]')
       .click('*[data-id="treeViewLitreeViewItemscripts/web3-lib.ts"]')
       .pause(2000)
       .getEditorValue((content) => {
         browser.assert.ok(content.indexOf(`export const deploy = async (contractName: string, args: Array<any>, from?: string, gas?: number): Promise<Options> => {`) !== -1,
-        'Incorrect content')
+          'Incorrect content')
       })
       .assert.elementPresent('*[data-id="treeViewLitreeViewItemscripts/ethers-lib.ts"]')
       .click('*[data-id="treeViewLitreeViewItemscripts/ethers-lib.ts"]')
       .pause(100)
       .getEditorValue((content) => {
         browser.assert.ok(content.indexOf(`export const deploy = async (contractName: string, args: Array<any>, accountIndex?: number): Promise<ethers.Contract> => {`) !== -1,
-        'Incorrect content')
+          'Incorrect content')
       })
       .assert.elementPresent('*[data-id="treeViewLitreeViewItemtests"]')
       .assert.elementPresent('*[data-id="treeViewLitreeViewItemtests/storage.test.js"]')
@@ -84,7 +84,7 @@ module.exports = {
       .pause(100)
       .getEditorValue((content) => {
         browser.assert.ok(content.indexOf(`const { expect } = require("chai");`) !== -1,
-        'Incorrect content')
+          'Incorrect content')
       })
       .assert.elementPresent('*[data-id="treeViewLitreeViewItemtests/Ballot_test.sol"]')
       .assert.elementPresent('*[data-id="treeViewLitreeViewItemREADME.txt"]')
@@ -106,8 +106,8 @@ module.exports = {
       .execute(function () {
         const fileList = document.querySelector('*[data-id="treeViewUltreeViewMenu"]')
         return fileList.getElementsByTagName('li').length;
-      }, [], function(result){
-          browser.assert.equal(result.value, 0, 'Incorrect number of files');
+      }, [], function (result) {
+        browser.assert.equal(result.value, 0, 'Incorrect number of files');
       });
   },
 
@@ -132,28 +132,28 @@ module.exports = {
       .pause(5000)
       .getEditorValue((content) => {
         browser.assert.ok(content.indexOf(`import { deploy } from './web3-lib'`) !== -1,
-        'Incorrect content')
+          'Incorrect content')
       })
       .assert.elementPresent('*[data-id="treeViewLitreeViewItemscripts/deploy_with_ethers.ts"]')
       .click('*[data-id="treeViewLitreeViewItemscripts/deploy_with_ethers.ts"]')
       .pause(100)
       .getEditorValue((content) => {
         browser.assert.ok(content.indexOf(`import { deploy } from './ethers-lib'`) !== -1,
-        'Incorrect content')
+          'Incorrect content')
       })
       .assert.elementPresent('*[data-id="treeViewLitreeViewItemscripts/web3-lib.ts"]')
       .click('*[data-id="treeViewLitreeViewItemscripts/web3-lib.ts"]')
       .pause(100)
       .getEditorValue((content) => {
         browser.assert.ok(content.indexOf(`export const deploy = async (contractName: string, args: Array<any>, from?: string, gas?: number): Promise<Options> => {`) !== -1,
-        'Incorrect content')
+          'Incorrect content')
       })
       .assert.elementPresent('*[data-id="treeViewLitreeViewItemscripts/ethers-lib.ts"]')
       .click('*[data-id="treeViewLitreeViewItemscripts/ethers-lib.ts"]')
       .pause(100)
       .getEditorValue((content) => {
         browser.assert.ok(content.indexOf(`export const deploy = async (contractName: string, args: Array<any>, accountIndex?: number): Promise<ethers.Contract> => {`) !== -1,
-        'Incorrect content')
+          'Incorrect content')
       })
       .assert.elementPresent('*[data-id="treeViewLitreeViewItemtests"]')
       .assert.elementPresent('*[data-id="treeViewLitreeViewItemtests/SampleERC20_test.sol"]')
@@ -177,31 +177,31 @@ module.exports = {
       .assert.elementPresent('*[data-id="treeViewLitreeViewItemscripts/deploy_with_web3.ts"]')
       // check js and ts files are not transformed
       .click('*[data-id="treeViewLitreeViewItemscripts/deploy_with_web3.ts"]')
-      
+
       .getEditorValue((content) => {
         browser.assert.ok(content.indexOf(`import { deploy } from './web3-lib'`) !== -1,
-        'Incorrect content')
+          'Incorrect content')
       })
       .assert.elementPresent('*[data-id="treeViewLitreeViewItemscripts/deploy_with_ethers.ts"]')
       .click('*[data-id="treeViewLitreeViewItemscripts/deploy_with_ethers.ts"]')
       .pause(100)
       .getEditorValue((content) => {
         browser.assert.ok(content.indexOf(`import { deploy } from './ethers-lib'`) !== -1,
-        'Incorrect content')
+          'Incorrect content')
       })
       .assert.elementPresent('*[data-id="treeViewLitreeViewItemscripts/web3-lib.ts"]')
       .click('*[data-id="treeViewLitreeViewItemscripts/web3-lib.ts"]')
       .pause(100)
       .getEditorValue((content) => {
         browser.assert.ok(content.indexOf(`export const deploy = async (contractName: string, args: Array<any>, from?: string, gas?: number): Promise<Options> => {`) !== -1,
-        'Incorrect content')
+          'Incorrect content')
       })
       .assert.elementPresent('*[data-id="treeViewLitreeViewItemscripts/ethers-lib.ts"]')
       .click('*[data-id="treeViewLitreeViewItemscripts/ethers-lib.ts"]')
       .pause(100)
       .getEditorValue((content) => {
         browser.assert.ok(content.indexOf(`export const deploy = async (contractName: string, args: Array<any>, accountIndex?: number): Promise<ethers.Contract> => {`) !== -1,
-        'Incorrect content')
+          'Incorrect content')
       })
       .assert.elementPresent('*[data-id="treeViewLitreeViewItemtests"]')
       .assert.elementPresent('*[data-id="treeViewLitreeViewItemtests/SampleERC721_test.sol"]')
@@ -211,26 +211,20 @@ module.exports = {
 
   'Should create two workspace and switch to the first one #group1': function (browser: NightwatchBrowser) {
     browser
-      .click('*[data-id="workspaceCreate"]') // create workspace_name
+      .click('*[data-id="workspaceCreate"]')
       .waitForElementVisible('*[data-id="modalDialogCustomPromptTextCreate"]')
-      .waitForElementVisible('[data-id="fileSystemModalDialogModalFooter-react"] > button')
-      .click('*[data-id="modalDialogCustomPromptTextCreate"]')
-      .clearValue('*[data-id="modalDialogCustomPromptTextCreate"]')
-      .setValue('*[data-id="modalDialogCustomPromptTextCreate"]', 'workspace_name')
+      .click('*[data-id="fileSystemModalDialogContainer-react"] input[data-id="modalDialogCustomPromptTextCreate"]')
+      .setValue('*[data-id="fileSystemModalDialogContainer-react"] input[data-id="modalDialogCustomPromptTextCreate"]', 'workspace_name')
       .waitForElementPresent('[data-id="fileSystemModalDialogModalFooter-react"] .modal-ok')
       .click('[data-id="fileSystemModalDialogModalFooter-react"] .modal-ok')
       .waitForElementVisible('*[data-id="treeViewLitreeViewItemtests"]')
       .pause(1000)
       .addFile('test.sol', { content: 'test' })
       .waitForElementVisible('*[data-id="treeViewLitreeViewItemtest.sol"]')
-      .click('*[data-id="workspaceCreate"]') // create workspace_name_1
+      .click('*[data-id="workspaceCreate"]')
       .waitForElementVisible('*[data-id="modalDialogCustomPromptTextCreate"]')
-      .waitForElementVisible('[data-id="fileSystemModalDialogModalFooter-react"] > button')
-      .click('*[data-id="modalDialogCustomPromptTextCreate"]')
-      .clearValue('*[data-id="modalDialogCustomPromptTextCreate"]')
-      .setValue('*[data-id="modalDialogCustomPromptTextCreate"]', 'workspace_name_1')
-      .waitForElementPresent('[data-id="fileSystemModalDialogModalFooter-react"] .modal-ok')
-      .click('[data-id="fileSystemModalDialogModalFooter-react"] .modal-ok')     
+      .click('*[data-id="fileSystemModalDialogContainer-react"] input[data-id="modalDialogCustomPromptTextCreate"]')
+      .setValue('*[data-id="fileSystemModalDialogContainer-react"] input[data-id="modalDialogCustomPromptTextCreate"]', 'workspace_name_1')
       .waitForElementVisible('*[data-id="treeViewLitreeViewItemtests"]')
       .pause(2000)
       .waitForElementNotPresent('*[data-id="treeViewLitreeViewItemtest.sol"]')
@@ -268,85 +262,85 @@ module.exports = {
       .waitForElementNotPresent(`[data-id="dropdown-item-workspace_name_1"]`)
   },
 
-    // CLONE REPOSITORY E2E START
+  // CLONE REPOSITORY E2E START
+
+  'Should clone a repository #group2': function (browser: NightwatchBrowser) {
+    browser
+      .clickLaunchIcon('filePanel')
+      .waitForElementVisible('[data-id="cloneGitRepository"]')
+      .click('[data-id="cloneGitRepository"]')
+      .waitForElementVisible('[data-id="fileSystemModalDialogModalBody-react"]')
+      .click('[data-id="fileSystemModalDialogModalBody-react"]')
+      .waitForElementVisible('[data-id="modalDialogCustomPromptTextClone"]')
+      .setValue('[data-id="modalDialogCustomPromptTextClone"]', 'https://github.com/ethereum/awesome-remix')
+      .click('[data-id="fileSystem-modal-footer-ok-react"]')
+      .waitForElementPresent('.fa-spinner')
+      .pause(5000)
+      .waitForElementNotPresent('.fa-spinner')
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItem.git"]')
+      .waitForElementContainsText('[data-id="workspacesSelect"]', 'awesome-remix')
+  },
 
-    'Should clone a repository #group2': function (browser: NightwatchBrowser) {
-      browser
-        .clickLaunchIcon('filePanel')
-        .waitForElementVisible('[data-id="cloneGitRepository"]')
-        .click('[data-id="cloneGitRepository"]')
-        .waitForElementVisible('[data-id="fileSystemModalDialogModalBody-react"]')
-        .click('[data-id="fileSystemModalDialogModalBody-react"]')
-        .waitForElementVisible('[data-id="modalDialogCustomPromptTextClone"]')
-        .setValue('[data-id="modalDialogCustomPromptTextClone"]', 'https://github.com/ethereum/awesome-remix')
-        .click('[data-id="fileSystem-modal-footer-ok-react"]')
-        .waitForElementPresent('.fa-spinner')
-        .pause(5000)
-        .waitForElementNotPresent('.fa-spinner')
-        .waitForElementVisible('*[data-id="treeViewLitreeViewItem.git"]')
-        .waitForElementContainsText('[data-id="workspacesSelect"]', 'awesome-remix')
-    },
+  'Should display dgit icon for cloned workspace #group2': function (browser: NightwatchBrowser) {
+    browser
+      .switchWorkspace('default_workspace')
+      .waitForElementNotVisible('[data-id="workspacesSelect"] .fa-code-branch')
+      .switchWorkspace('awesome-remix')
+      .waitForElementVisible('[data-id="workspacesSelect"] .fa-code-branch')
+  },
 
-    'Should display dgit icon for cloned workspace #group2': function (browser: NightwatchBrowser) {
-      browser
-        .switchWorkspace('default_workspace')
-        .waitForElementNotVisible('[data-id="workspacesSelect"] .fa-code-branch')
-        .switchWorkspace('awesome-remix')
-        .waitForElementVisible('[data-id="workspacesSelect"] .fa-code-branch')
-    },
-    
-    'Should display non-clashing names for duplicate clone #group2': '' + function (browser: NightwatchBrowser) {
-      browser
-        .waitForElementVisible('[data-id="cloneGitRepository"]')
-        .click('[data-id="cloneGitRepository"]')
-        .waitForElementVisible('[data-id="fileSystemModalDialogModalBody-react"]')
-        .click('[data-id="fileSystemModalDialogModalBody-react"]')
-        .waitForElementVisible('[data-id="modalDialogCustomPromptTextClone"]')
-        .setValue('[data-id="modalDialogCustomPromptTextClone"]', 'https://github.com/ethereum/awesome-remix')
-        .click('[data-id="fileSystem-modal-footer-ok-react"]')
-        .pause(5000)
-        .waitForElementContainsText('[data-id="workspacesSelect"]', 'awesome-remix1')
-        .waitForElementVisible('[data-id="cloneGitRepository"]')
-        .click('[data-id="cloneGitRepository"]')
-        .waitForElementVisible('[data-id="fileSystemModalDialogModalBody-react"]')
-        .click('[data-id="fileSystemModalDialogModalBody-react"]')
-        .waitForElementVisible('[data-id="modalDialogCustomPromptTextClone"]')
-        .setValue('[data-id="modalDialogCustomPromptTextClone"]', 'https://github.com/ethereum/awesome-remix')
-        .click('[data-id="fileSystem-modal-footer-ok-react"]')
-        .pause(5000)
-        .waitForElementContainsText('[data-id="workspacesSelect"]', 'awesome-remix2')
-        .waitForElementVisible('[data-id="cloneGitRepository"]')
-        .click('[data-id="cloneGitRepository"]')
-        .waitForElementVisible('[data-id="fileSystemModalDialogModalBody-react"]')
-        .click('[data-id="fileSystemModalDialogModalBody-react"]')
-        .waitForElementVisible('[data-id="modalDialogCustomPromptTextClone"]')
-        .setValue('[data-id="modalDialogCustomPromptTextClone"]', 'https://github.com/ethereum/awesome-remix')
-        .click('[data-id="fileSystem-modal-footer-ok-react"]')
-        .pause(5000)
-        .waitForElementContainsText('[data-id="workspacesSelect"]', 'awesome-remix3')
-        .switchWorkspace('awesome-remix')
-        .switchWorkspace('awesome-remix1')
-        .switchWorkspace('awesome-remix2')
-        .switchWorkspace('awesome-remix3')
-    },
+  'Should display non-clashing names for duplicate clone #group2': '' + function (browser: NightwatchBrowser) {
+    browser
+      .waitForElementVisible('[data-id="cloneGitRepository"]')
+      .click('[data-id="cloneGitRepository"]')
+      .waitForElementVisible('[data-id="fileSystemModalDialogModalBody-react"]')
+      .click('[data-id="fileSystemModalDialogModalBody-react"]')
+      .waitForElementVisible('[data-id="modalDialogCustomPromptTextClone"]')
+      .setValue('[data-id="modalDialogCustomPromptTextClone"]', 'https://github.com/ethereum/awesome-remix')
+      .click('[data-id="fileSystem-modal-footer-ok-react"]')
+      .pause(5000)
+      .waitForElementContainsText('[data-id="workspacesSelect"]', 'awesome-remix1')
+      .waitForElementVisible('[data-id="cloneGitRepository"]')
+      .click('[data-id="cloneGitRepository"]')
+      .waitForElementVisible('[data-id="fileSystemModalDialogModalBody-react"]')
+      .click('[data-id="fileSystemModalDialogModalBody-react"]')
+      .waitForElementVisible('[data-id="modalDialogCustomPromptTextClone"]')
+      .setValue('[data-id="modalDialogCustomPromptTextClone"]', 'https://github.com/ethereum/awesome-remix')
+      .click('[data-id="fileSystem-modal-footer-ok-react"]')
+      .pause(5000)
+      .waitForElementContainsText('[data-id="workspacesSelect"]', 'awesome-remix2')
+      .waitForElementVisible('[data-id="cloneGitRepository"]')
+      .click('[data-id="cloneGitRepository"]')
+      .waitForElementVisible('[data-id="fileSystemModalDialogModalBody-react"]')
+      .click('[data-id="fileSystemModalDialogModalBody-react"]')
+      .waitForElementVisible('[data-id="modalDialogCustomPromptTextClone"]')
+      .setValue('[data-id="modalDialogCustomPromptTextClone"]', 'https://github.com/ethereum/awesome-remix')
+      .click('[data-id="fileSystem-modal-footer-ok-react"]')
+      .pause(5000)
+      .waitForElementContainsText('[data-id="workspacesSelect"]', 'awesome-remix3')
+      .switchWorkspace('awesome-remix')
+      .switchWorkspace('awesome-remix1')
+      .switchWorkspace('awesome-remix2')
+      .switchWorkspace('awesome-remix3')
+  },
 
-    'Should display error message in modal for failed clone #group2': function (browser: NightwatchBrowser) {
-      browser
-        .waitForElementVisible('[data-id="cloneGitRepository"]')
-        .click('[data-id="cloneGitRepository"]')
-        .waitForElementVisible('[data-id="fileSystemModalDialogModalBody-react"]')
-        .click('[data-id="fileSystemModalDialogModalBody-react"]')
-        .waitForElementVisible('[data-id="modalDialogCustomPromptTextClone"]')
-        .setValue('[data-id="modalDialogCustomPromptTextClone"]', 'https://github.com/ethereum/non-existent-repo')
-        .click('[data-id="fileSystem-modal-footer-ok-react"]')
-        .pause(5000)
-        .waitForElementVisible('[data-id="cloneGitRepositoryModalDialogModalBody-react"]')
-        .waitForElementContainsText('[data-id="cloneGitRepositoryModalDialogModalBody-react"]', 'An error occurred: Please check that you have the correct URL for the repo. If the repo is private, you need to add your github credentials (with the valid token permissions) in Settings plugin')
-        .click('[data-id="cloneGitRepository-modal-footer-ok-react"]')
-        .end()
-    },
+  'Should display error message in modal for failed clone #group2': function (browser: NightwatchBrowser) {
+    browser
+      .waitForElementVisible('[data-id="cloneGitRepository"]')
+      .click('[data-id="cloneGitRepository"]')
+      .waitForElementVisible('[data-id="fileSystemModalDialogModalBody-react"]')
+      .click('[data-id="fileSystemModalDialogModalBody-react"]')
+      .waitForElementVisible('[data-id="modalDialogCustomPromptTextClone"]')
+      .setValue('[data-id="modalDialogCustomPromptTextClone"]', 'https://github.com/ethereum/non-existent-repo')
+      .click('[data-id="fileSystem-modal-footer-ok-react"]')
+      .pause(5000)
+      .waitForElementVisible('[data-id="cloneGitRepositoryModalDialogModalBody-react"]')
+      .waitForElementContainsText('[data-id="cloneGitRepositoryModalDialogModalBody-react"]', 'An error occurred: Please check that you have the correct URL for the repo. If the repo is private, you need to add your github credentials (with the valid token permissions) in Settings plugin')
+      .click('[data-id="cloneGitRepository-modal-footer-ok-react"]')
+      .end()
+  },
 
-    // CLONE REPOSITORY E2E END
+  // CLONE REPOSITORY E2E END
 
   tearDown: sauce
 }