diff --git a/docs/en_US/release_notes_4_4.rst b/docs/en_US/release_notes_4_4.rst
index d718632b0..987b9102e 100644
--- a/docs/en_US/release_notes_4_4.rst
+++ b/docs/en_US/release_notes_4_4.rst
@@ -22,6 +22,7 @@ Bug fixes
 | `Bug #3104 <https://redmine.postgresql.org/issues/3104>`_ - Improve a couple of German translations.
 | `Bug #3995 <https://redmine.postgresql.org/issues/3995>`_ - Avoid 'bogus varno' message from Postgres when viewing the SQL for a table with triggers.
 | `Bug #4019 <https://redmine.postgresql.org/issues/4019>`_ - Update all Python and JavaScript dependencies.
+| `Bug #4050 <https://redmine.postgresql.org/issues/4050>`_ - Make the WHEN field a CodeMirror control on the Event Trigger dialogue.
 | `Bug #4052 <https://redmine.postgresql.org/issues/4052>`_ - Fix the online help button on the resource group dialogue.
 | `Bug #4053 <https://redmine.postgresql.org/issues/4053>`_ - Enable the online help button on the index dialogue.
 | `Bug #4054 <https://redmine.postgresql.org/issues/4054>`_ - Handle resultsets with zero columns correctly in the Query Tool.
diff --git a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/static/js/event_trigger.js b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/static/js/event_trigger.js
index cc585a7c1..fc78e602a 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/static/js/event_trigger.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/static/js/event_trigger.js
@@ -129,7 +129,10 @@ define('pgadmin.node.event_trigger', [
             {label: 'SQL DROP', value: 'SQL_DROP'},
           ],
         },{
-          id: 'when', label: gettext('When'), type: 'multiline', group: gettext('Definition'),
+          id: 'when', label: gettext('When'),  cell: 'string',
+          type: 'text', group: gettext('Definition'),
+          control: Backform.SqlFieldControl,
+          extraClasses:['custom_height_css_class'],
         },{
           id: 'seclabels', label: gettext('Security labels'),
           model: pgBrowser.SecLabelModel, editable: false, type: 'collection',