diff --git a/apps/remix-ide-e2e/src/tests/workspace.test.ts b/apps/remix-ide-e2e/src/tests/workspace.test.ts
index 6ce4c81c60..9b04dc9500 100644
--- a/apps/remix-ide-e2e/src/tests/workspace.test.ts
+++ b/apps/remix-ide-e2e/src/tests/workspace.test.ts
@@ -50,6 +50,29 @@ module.exports = {
       .waitForElementNotPresent('*[data-id="treeViewLitreeViewItemtest.sol"]')
       .click('*[data-id="workspacesSelect"] option[value="workspace_name"]')
       .waitForElementVisible('*[data-id="treeViewLitreeViewItemtests"]')
+  },
+
+  'Should rename a workspace': function (browser: NightwatchBrowser) {
+    browser
+      .click('*[data-id="workspaceRename"]') // rename workspace_name
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItemtests"]')
+      .waitForElementVisible('*[data-id="modalDialogCustomPromptTextRename"]')
+      // eslint-disable-next-line dot-notation
+      .execute(function () { document.querySelector('*[data-id="modalDialogCustomPromptTextRename"]')['value'] = 'workspace_name_renamed' })
+      .click('*[data-id="workspacesModalDialogModalDialogModalFooter-react"] .modal-ok')
+      .click('*[data-id="workspacesSelect"] option[value="workspace_name_1"]')
+      .waitForElementNotPresent('*[data-id="treeViewLitreeViewItemtest.sol"]')
+      .click('*[data-id="workspacesSelect"] option[value="workspace_name_renamed"]')
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItemtest.sol"]')  
+  },
+
+  'Should delete a workspace': function (browser: NightwatchBrowser) {
+    browser
+      .click('*[data-id="workspacesSelect"] option[value="workspace_name_1"]')
+      .click('*[data-id="workspaceDelete"]') // delete workspace_name_1
+      .waitForElementVisible('*[data-id="workspacesModalDialogModalDialogModalFooter-react"] .modal-ok')
+      .click('*[data-id="workspacesModalDialogModalDialogModalFooter-react"] .modal-ok')
+      .waitForElementNotPresent('*[data-id="workspacesSelect"] option[value="workspace_name_1"]')
       .end()
   },
 
diff --git a/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx b/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx
index 5ac80a1bfc..94273790e5 100644
--- a/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx
+++ b/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx
@@ -143,7 +143,7 @@ export const Workspace = (props: WorkspaceProps) => {
   }
 
   const deleteCurrentWorkspace = () => {
-    modal('Remove Workspace', 'Please choose a name for the workspace', {
+    modal('Remove Workspace', 'Are you sure to delete the current workspace?', {
       label: 'OK',
       fn: onFinishDeleteWorkspace
     }, {