diff --git a/core/misc/ajax.es6.js b/core/misc/ajax.es6.js
index 9362ee1c21..575b40793d 100644
--- a/core/misc/ajax.es6.js
+++ b/core/misc/ajax.es6.js
@@ -604,14 +604,17 @@
       wrapper += `.${elementSettings.dialogRenderer}`;
     }
 
-    var queryParameter = Drupal.ajax.WRAPPER_FORMAT + '=' + wrapper;
+    const queryParameter = $(`Drupal.ajax.WRAPPER_FORMAT + '=' + wrapper`);
     if (ajax.options.url.indexOf(Drupal.ajax.WRAPPER_FORMAT) === -1) {
       // Ensure that we have a valid URL by adding ? when no query parameter is
       // yet available, otherwise append using &.
-      ajax.options.url += (ajax.options.url.indexOf('?') === -1) ? '?' : '&';
+      ajax.options.url += ajax.options.url.indexOf('?') === -1 ? '?' : '&';
       ajax.options.url += queryParameter;
     } else {
-      var regexPattern = new RegExp(Drupal.ajax.WRAPPER_FORMAT + '=[^&]*', 'i');
+      const regexPattern = new RegExp(
+        $(`Drupal.ajax.WRAPPER_FORMAT + '=[^&]*'`),
+        'i',
+      );
       ajax.options.url = ajax.options.url.replace(regexPattern, queryParameter);
     }
 
diff --git a/core/misc/ajax.js b/core/misc/ajax.js
index 90b92a9081..8522aa1c76 100644
--- a/core/misc/ajax.js
+++ b/core/misc/ajax.js
@@ -228,19 +228,16 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
     if (elementSettings.dialog) {
       ajax.options.data.dialogOptions = elementSettings.dialog;
     }
-
     var wrapper = "drupal_".concat(elementSettings.dialogType || 'ajax');
     if (elementSettings.dialogRenderer) {
       wrapper += ".".concat(elementSettings.dialogRenderer);
     }
-    var queryParameter = Drupal.ajax.WRAPPER_FORMAT + '=' + wrapper;
+    var queryParameter = $("Drupal.ajax.WRAPPER_FORMAT + '=' + wrapper");
     if (ajax.options.url.indexOf(Drupal.ajax.WRAPPER_FORMAT) === -1) {
-      // Ensure that we have a valid URL by adding ? when no query parameter is
-      // yet available, otherwise append using &.
-      ajax.options.url += (ajax.options.url.indexOf('?') === -1) ? '?' : '&';
+      ajax.options.url += ajax.options.url.indexOf('?') === -1 ? '?' : '&';
       ajax.options.url += queryParameter;
     } else {
-      var regexPattern = new RegExp(Drupal.ajax.WRAPPER_FORMAT + '=[^&]*', 'i');
+      var regexPattern = new RegExp($("Drupal.ajax.WRAPPER_FORMAT + '=[^&]*'"), 'i');
       ajax.options.url = ajax.options.url.replace(regexPattern, queryParameter);
     }
     $(ajax.element).on(elementSettings.event, function (event) {
@@ -644,4 +641,4 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
       }
     }
   });
-})(jQuery, window, Drupal, drupalSettings, loadjs, window.tabbable);
+})(jQuery, window, Drupal, drupalSettings, loadjs, window.tabbable);
\ No newline at end of file