diff --git a/resources/codemirror.js b/resources/codemirror.js
index 04f6336a..5133931e 100644
--- a/resources/codemirror.js
+++ b/resources/codemirror.js
@@ -104,8 +104,12 @@ class CodeMirror {
 			this.dirExtension,
 			EditorState.readOnly.of( this.readOnly ),
 			EditorView.domEventHandlers( {
-				blur: () => this.$textarea.triggerHandler( 'blur' ),
-				focus: () => this.$textarea.triggerHandler( 'focus' )
+				blur: () => {
+					this.$textarea[ 0 ].dispatchEvent( new Event( 'blur' ) );
+				},
+				focus: () => {
+					this.$textarea[ 0 ].dispatchEvent( new Event( 'focus' ) );
+				}
 			} ),
 			EditorView.lineWrapping,
 			keymap.of( [
diff --git a/resources/legacy/ext.CodeMirror.WikiEditor.js b/resources/legacy/ext.CodeMirror.WikiEditor.js
index ec28c4b1..6c6ee094 100644
--- a/resources/legacy/ext.CodeMirror.WikiEditor.js
+++ b/resources/legacy/ext.CodeMirror.WikiEditor.js
@@ -191,10 +191,10 @@ function init() {
 			const $codeMirror = $( codeMirror.getWrapperElement() );
 
 			codeMirror.on( 'focus', () => {
-				$textbox1.triggerHandler( 'focus' );
+				$textbox1[ 0 ].dispatchEvent( new Event( 'focus' ) );
 			} );
 			codeMirror.on( 'blur', () => {
-				$textbox1.triggerHandler( 'blur' );
+				$textbox1[ 0 ].dispatchEvent( new Event( 'blur' ) );
 			} );
 			mw.hook( 'editRecovery.loadEnd' ).add( ( data ) => {
 				codeMirror.on( 'change', data.fieldChangeHandler );