diff --git a/apps/remix-ide-e2e/src/tests/pinned_contracts.test.ts b/apps/remix-ide-e2e/src/tests/pinned_contracts.test.ts
index ec891a9c1e..d1b3b4eefb 100644
--- a/apps/remix-ide-e2e/src/tests/pinned_contracts.test.ts
+++ b/apps/remix-ide-e2e/src/tests/pinned_contracts.test.ts
@@ -17,14 +17,17 @@ module.exports = {
     browser
       .clickLaunchIcon('filePanel')
       .waitForElementVisible('*[data-id="treeViewLitreeViewItemcontracts"]')
-      .click('*[data-id="treeViewLitreeViewItemcontracts]')
+      .click('*[data-id="treeViewLitreeViewItemcontracts"]')
       .click('*[data-id="treeViewLitreeViewItemcontracts/1_Storage.sol"]')
       .clickLaunchIcon('udapp')
       .click('*[data-id="Deploy - transact (not payable)"]')
-      .waitForElementPresent('*[data-shared="universalDappUiInstance"]')
+      .assert.elementPresent('*[data-id="unpinnedInstance0xd9145CCE52D386f254917e481eB44e9943F39138"]')
+      .assert.not.hasClass('*[data-id="universalDappUiUdappPin"]', 'text-success')
       .click('*[data-id="universalDappUiUdappPin"]')
       .assert.elementPresent('*[data-id="deployAndRunNoInstanceText"]')
       .assert.textContains('*[data-id="deployAndRunNoInstanceText"]', 'Currently you have no unpinned contracts to interact with.')
-      .assert.elementNotPresent('*[data-id="NoPinnedInstanceText"]')
-  },
+      .assert.not.elementPresent('*[data-id="NoPinnedInstanceText"]')
+      .assert.elementPresent('*[data-id="pinnedInstance0xd9145CCE52D386f254917e481eB44e9943F39138"]')
+      .assert.hasClass('*[data-id="universalDappUiUdappUnpin"]', 'text-success')
+    },
 }
\ No newline at end of file
diff --git a/libs/remix-ui/run-tab/src/lib/components/universalDappUI.tsx b/libs/remix-ui/run-tab/src/lib/components/universalDappUI.tsx
index 25b6c8f270..c5cf200ddf 100644
--- a/libs/remix-ui/run-tab/src/lib/components/universalDappUI.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/universalDappUI.tsx
@@ -261,6 +261,7 @@ export function UniversalDappUI(props: UdappProps) {
       className={`instance udapp_instance udapp_run-instance border-dark ${toggleExpander ? 'udapp_hidesub' : 'bg-light'}`}
       id={`instance${address}`}
       data-shared="universalDappUiInstance"
+      data-id={props.isPinnedContract ? `pinnedInstance${address}` : `unpinnedInstance${address}`}
     >
       <div className="udapp_title pb-0 alert alert-secondary">
         <span data-id={`universalDappUiTitleExpander${props.index}`} className="btn udapp_titleExpander" onClick={toggleClass} style={{padding: "0.45rem"}}>