diff --git a/apps/remix-ide-e2e/src/commands/clickFunction.ts b/apps/remix-ide-e2e/src/commands/clickFunction.ts
index e84be6a0d0..9ae4b3c330 100644
--- a/apps/remix-ide-e2e/src/commands/clickFunction.ts
+++ b/apps/remix-ide-e2e/src/commands/clickFunction.ts
@@ -3,18 +3,18 @@ import EventEmitter from 'events'
 
 class ClickFunction extends EventEmitter {
   command (this: NightwatchBrowser, fnFullName: string, expectedInput?: NightwatchClickFunctionExpectedInput): NightwatchBrowser {
-    this.api.waitForElementPresent('.instance button[title="' + fnFullName + '"]')
+    this.api.waitForElementPresent('.instance button[data-title="' + fnFullName + '"]')
       .perform(function (client, done) {
         client.execute(function () {
           document.querySelector('#runTabView').scrollTop = document.querySelector('#runTabView').scrollHeight
         }, [], function () {
           if (expectedInput) {
-            client.setValue('#runTabView input[title="' + expectedInput.types + '"]', expectedInput.values, _ => _)
+            client.setValue('#runTabView input[data-title="' + expectedInput.types + '"]', expectedInput.values, _ => _)
           }
           done()
         })
       })
-      .scrollAndClick('.instance button[title="' + fnFullName + '"]')
+      .scrollAndClick('.instance button[data-title="' + fnFullName + '"]')
       .pause(2000)
       .perform(() => {
         this.emit('complete')
diff --git a/libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx b/libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx
index 1a8044c1cc..876e8a28bb 100644
--- a/libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx
@@ -241,7 +241,7 @@ export function ContractGUI (props: ContractGUIProps) {
             <span>{buttonOptions.title}</span>
           </Tooltip>
         }>
-        <button onClick={handleActionClick} className={`udapp_instanceButton ${props.widthClass} btn btn-sm ${buttonOptions.classList}`} data-id={buttonOptions.dataId}>{title}</button>
+        <button onClick={handleActionClick} className={`udapp_instanceButton ${props.widthClass} btn btn-sm ${buttonOptions.classList}`} data-id={buttonOptions.dataId} data-title={buttonOptions.title}>{title}</button>
         </OverlayTrigger>
         <OverlayTrigger placement={'right'} overlay={
           <Tooltip className="text-nowrap" id="remixContractGuiTooltip">
@@ -252,6 +252,7 @@ export function ContractGUI (props: ContractGUIProps) {
           className="form-control"
           data-id={props.funcABI.type === 'fallback' || props.funcABI.type === 'receive' ? `'(${props.funcABI.type}')` : 'multiParamManagerBasicInputField'}
           placeholder={props.inputs}
+          data-title={props.funcABI.type === 'fallback' || props.funcABI.type === 'receive' ? `'(${props.funcABI.type}')` : props.inputs}
           onChange={handleBasicInput}
           ref={basicInputRef}
           style={{ visibility: !((props.funcABI.inputs && props.funcABI.inputs.length > 0) || (props.funcABI.type === 'fallback') || (props.funcABI.type === 'receive')) ? 'hidden' : 'visible' }} />