diff --git a/core/modules/system/templates/checkboxes.html.twig b/core/modules/system/templates/checkboxes.html.twig
index 7c56355..75b2261 100644
--- a/core/modules/system/templates/checkboxes.html.twig
+++ b/core/modules/system/templates/checkboxes.html.twig
@@ -14,4 +14,4 @@
  @todo: remove this file once http://drupal.org/node/1819284 is resolved.
  This is identical to core/modules/system/templates/container.html.twig
 #}
-<div{{ attributes.addClass('form-checkboxes') }}>{{ children }}</div>
+<div{{ attributes.addClass('js-form-checkboxes') }}>{{ children }}</div>
diff --git a/core/modules/views_ui/js/views-admin.js b/core/modules/views_ui/js/views-admin.js
index 5310062..b74459e 100644
--- a/core/modules/views_ui/js/views-admin.js
+++ b/core/modules/views_ui/js/views-admin.js
@@ -775,7 +775,7 @@
         .on('click', function () {
           var checked = $(this).is(':checked');
           // Update all checkbox beside the select all checkbox.
-          $(this).parents('.form-checkboxes').find('input[type=checkbox]').each(function () {
+          $(this).parents('.js-form-checkboxes').find('input[type=checkbox]').each(function () {
             $(this).attr('checked', checked);
           });
         });
diff --git a/core/modules/views_ui/src/Form/Ajax/AddHandler.php b/core/modules/views_ui/src/Form/Ajax/AddHandler.php
index 8cc2e8c..7fe64d8 100644
--- a/core/modules/views_ui/src/Form/Ajax/AddHandler.php
+++ b/core/modules/views_ui/src/Form/Ajax/AddHandler.php
@@ -105,7 +105,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
       );
 
       $form['options']['name'] = array(
-        '#prefix' => '<div class="views-radio-box form-checkboxes views-filterable-options">',
+        '#prefix' => '<div class="views-radio-box js-form-checkboxes form-checkboxes views-filterable-options">',
         '#suffix' => '</div>',
         '#tree' => TRUE,
         '#default_value' => 'all',
diff --git a/core/themes/classy/templates/form/checkboxes.html.twig b/core/themes/classy/templates/form/checkboxes.html.twig
index 7c56355..506f223 100644
--- a/core/themes/classy/templates/form/checkboxes.html.twig
+++ b/core/themes/classy/templates/form/checkboxes.html.twig
@@ -14,4 +14,4 @@
  @todo: remove this file once http://drupal.org/node/1819284 is resolved.
  This is identical to core/modules/system/templates/container.html.twig
 #}
-<div{{ attributes.addClass('form-checkboxes') }}>{{ children }}</div>
+<div{{ attributes.addClass('js-form-checkboxes', 'form-checkboxes') }}>{{ children }}</div>