diff -u b/core/modules/views_ui/src/Form/Ajax/AddHandler.php b/core/modules/views_ui/src/Form/Ajax/AddHandler.php
--- b/core/modules/views_ui/src/Form/Ajax/AddHandler.php
+++ b/core/modules/views_ui/src/Form/Ajax/AddHandler.php
@@ -114,10 +114,10 @@
           $this->t('Description'),
         ),
         '#tableselect' => TRUE,
+        '#js_select' => FALSE,
         '#tree' => TRUE,
       );
 
-      // Group options first to simplify the usage of #states.
       $grouped_options = array();
       foreach ($options as $key => $option) {
         $group = preg_replace('/[^a-z0-9]/', '-', strtolower($option['group']));
@@ -144,25 +144,9 @@
       foreach ($grouped_options as $group => $group_options) {
         foreach ($group_options as $key => $option) {
           $form['options']['name'][$key] = array(
-            // '#type' => 'checkbox',
-            // '#title' => $this->t('@group: @field', array('@group' => $option['group'], '@field' => $option['title'])),
-            // '#description' => $option['help'],
-            // '#return_value' => $key,
-            // '#prefix' => "<div class='filterable-option'>",
-            // '#suffix' => '</div>',
             '#tree' => TRUE,
-            '#states' => array(
-              'visible' => array(
-                array(
-                  ':input[name="override[controls][group]"]' => array('value' => 'all'),
-                ),
-                array(
-                  ':input[name="override[controls][group]"]' => array('value' => $group),
-                ),
-              ),
-            ),
             '#attributes' => array(
-              'class' => array('filterable-option'),
+              'class' => array('filterable-option', $group),
             ),
             'title' => array(
               '#markup' => $option['title'],