diff --git a/apps/remix-ide-e2e/src/tests/publishContract.test.ts b/apps/remix-ide-e2e/src/tests/publishContract.test.ts
index 72d9e2ecc9..671893a26e 100644
--- a/apps/remix-ide-e2e/src/tests/publishContract.test.ts
+++ b/apps/remix-ide-e2e/src/tests/publishContract.test.ts
@@ -45,8 +45,6 @@ module.exports = {
     browser
     .waitForElementVisible('#icon-panel')
     .clickLaunchIcon('fileExplorers')
-    // .click('*[data-id="treeViewLibrowser/contracts"]')
-    // .click('*[data-id="treeViewLibrowser/contracts"]')
     .openFile('browser/contracts/1_Storage.sol')
     .clickLaunchIcon('udapp')
     .waitForElementPresent('*[data-id="contractDropdownIpfsCheckbox"]')
@@ -65,7 +63,6 @@ module.exports = {
     .refresh()
     .waitForElementVisible('[data-id="treeViewLitreeViewItembrowser/contracts"]')
     .click('[data-id="treeViewLitreeViewItembrowser/contracts"]')
-    // .click('*[data-id="treeViewLibrowser/contracts"]')
     .openFile('browser/contracts/1_Storage.sol')
     .clickLaunchIcon('udapp')
     .waitForElementPresent('*[data-id="contractDropdownIpfsCheckbox"]')
diff --git a/libs/remix-ui/modal-dialog/src/lib/remix-ui-modal-dialog.tsx b/libs/remix-ui/modal-dialog/src/lib/remix-ui-modal-dialog.tsx
index c2401174a7..929c23786b 100644
--- a/libs/remix-ui/modal-dialog/src/lib/remix-ui-modal-dialog.tsx
+++ b/libs/remix-ui/modal-dialog/src/lib/remix-ui-modal-dialog.tsx
@@ -42,7 +42,7 @@ export const ModalDialog = (props: ModalDialogProps) => {
 
   return (
     <div
-      data-id="modalDialogContainer"
+      data-id="modalDialogContainer-react"
       data-backdrop="static"
       data-keyboard="false"
       className='modal'
@@ -61,7 +61,7 @@ export const ModalDialog = (props: ModalDialogProps) => {
           onKeyDown={({ keyCode }) => { modalKeyEvent(keyCode) }}
         >
           <div className="modal-header">
-            <h6 className="modal-title" data-id="modalDialogModalTitle">
+            <h6 className="modal-title" data-id="modalDialogModalTitle-react">
               {props.title && props.title}
             </h6>
             {!props.showCancelIcon &&
@@ -70,10 +70,10 @@ export const ModalDialog = (props: ModalDialogProps) => {
             </span>
             }
           </div>
-          <div className="modal-body text-break remixModalBody" data-id="modalDialogModalBody">
+          <div className="modal-body text-break remixModalBody" data-id="modalDialogModalBody-react">
             { props.children ? props.children : props.message }
           </div>
-          <div className="modal-footer" data-id="modalDialogModalFooter">
+          <div className="modal-footer" data-id="modalDialogModalFooter-react">
             {/* todo add autofocus ^^ */}
             { props.ok &&
               <span