diff --git a/assets/js/misc/dialog/dialog.ajax.js b/assets/js/misc/dialog/dialog.ajax.js
index 1d1d80fcf0167714328481cd271e753654f0fba0..dae1ec3f9cb91c26b0036a5db98fc59803c82fdf 100644
--- a/assets/js/misc/dialog/dialog.ajax.js
+++ b/assets/js/misc/dialog/dialog.ajax.js
@@ -273,9 +273,9 @@
     }
   };
 
-  // eslint-disable-next-line
-  $(window).on('dialog:aftercreate', (e, dialog, $element, settings) => {
-    // eslint-disable-next-line
+  window.addEventListener('dialog:aftercreate', (event) => {
+    const $element = $(event.target);
+    const dialog = event.dialog;
     $element.on('click.dialog', '.dialog-cancel', (e) => {
       dialog.close('cancel');
       e.preventDefault();
@@ -283,7 +283,8 @@
     });
   });
 
-  $(window).on('dialog:beforeclose', (e, dialog, $element) => {
+  window.addEventListener('dialog:beforeclose', (e) => {
+    const $element = $(e.target);
     $element.off('.dialog');
 
     // Do some extra things here, set Drupal.autocomplete options to render