diff --git a/cypress-tests/cypress/support/utils/commonWidget.js b/cypress-tests/cypress/support/utils/commonWidget.js
index 7980402f1a..9bcb449c03 100644
--- a/cypress-tests/cypress/support/utils/commonWidget.js
+++ b/cypress-tests/cypress/support/utils/commonWidget.js
@@ -58,9 +58,9 @@ export const addDefaultEventHandler = (message) => {
     .should("have.text", commonWidgetText.addEventHandlerLink)
     .click();
   cy.get(commonWidgetSelector.eventHandlerCard).click();
-  cy.get(commonWidgetSelector.alertMessageInputField).clearAndTypeOnCodeMirror(
-    message
-  );
+  cy.get(commonWidgetSelector.alertMessageInputField)
+    .find('[data-cy*="-input-field"]')
+    .clearAndTypeOnCodeMirror(message);
 };
 
 export const addAndVerifyTooltip = (widgetSelector, message) => {
diff --git a/frontend/src/Editor/Inspector/EventManager.jsx b/frontend/src/Editor/Inspector/EventManager.jsx
index c96bdfe39b..ecd7f2be86 100644
--- a/frontend/src/Editor/Inspector/EventManager.jsx
+++ b/frontend/src/Editor/Inspector/EventManager.jsx
@@ -237,14 +237,13 @@ export const EventManager = ({
                   <div className="col-3 p-2" data-cy="message-label">
                     Message
                   </div>
-                  <div className="col-9" data-cy="message-text">
+                  <div className="col-9" data-cy="alert-message-input-field">
                     <CodeHinter
                       theme={darkMode ? 'monokai' : 'default'}
                       currentState={currentState}
                       initialValue={event.message}
                       onChange={(value) => handlerChanged(index, 'message', value)}
                       usePortalEditor={false}
-                      paramLabel="alert-message"
                     />
                   </div>
                 </div>