diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php
index 042b8a0acbf08ba35f504011bcaa47bb0a2b8e05..eb0271a6e8df9b5749e2135ba1b4239160cdd444 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php
@@ -399,6 +399,7 @@ protected function showBuildGroupButton(&$form, &$form_state) {
         '#type' => 'submit',
         '#value' => t('Grouped filters'),
         '#submit' => array(array($this, 'buildGroupForm')),
+        '#attributes' => array('class' => array('use-ajax-submit')),
       );
       $form['group_button']['radios']['radios']['#default_value'] = 0;
     }
@@ -408,6 +409,7 @@ protected function showBuildGroupButton(&$form, &$form_state) {
         '#type' => 'submit',
         '#value' => t('Single filter'),
         '#submit' => array(array($this, 'buildGroupForm')),
+        '#attributes' => array('class' => array('use-ajax-submit')),
       );
       $form['group_button']['radios']['radios']['#default_value'] = 1;
     }
@@ -468,6 +470,7 @@ public function showExposeButton(&$form, &$form_state) {
         '#type' => 'submit',
         '#value' => t('Expose filter'),
         '#submit' => array(array($this, 'displayExposedForm')),
+        '#attributes' => array('class' => array('use-ajax-submit')),
       );
       $form['expose_button']['checkbox']['checkbox']['#default_value'] = 0;
     }
@@ -480,6 +483,7 @@ public function showExposeButton(&$form, &$form_state) {
         '#type' => 'submit',
         '#value' => t('Hide filter'),
         '#submit' => array(array($this, 'displayExposedForm')),
+        '#attributes' => array('class' => array('use-ajax-submit')),
       );
       $form['expose_button']['checkbox']['checkbox']['#default_value'] = 1;
     }
@@ -1061,6 +1065,7 @@ protected function buildExposedFiltersGroupForm(&$form, &$form_state) {
       '#type' => 'submit',
       '#value' => t('Add another item'),
       '#submit' => array(array($this, 'addGroupForm')),
+      '#attributes' => array('class' => array('use-ajax-submit')),
     );
 
     $js = array();
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/sort/SortPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/sort/SortPluginBase.php
index 3273b2b18b91981647f46c544cc35a26cba022b4..74c9710c58c19fb3f53b6d0ca9eff0426a95b090 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/sort/SortPluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/sort/SortPluginBase.php
@@ -117,6 +117,7 @@ public function showExposeButton(&$form, &$form_state) {
         '#type' => 'submit',
         '#value' => t('Expose sort'),
         '#submit' => array(array($this, 'displayExposedForm')),
+        '#attributes' => array('class' => array('use-ajax-submit')),
       );
       $form['expose_button']['checkbox']['checkbox']['#default_value'] = 0;
     }
@@ -129,6 +130,7 @@ public function showExposeButton(&$form, &$form_state) {
         '#type' => 'submit',
         '#value' => t('Hide sort'),
         '#submit' => array(array($this, 'displayExposedForm')),
+        '#attributes' => array('class' => array('use-ajax-submit')),
       );
       $form['expose_button']['checkbox']['checkbox']['#default_value'] = 1;
     }
diff --git a/core/modules/views_ui/js/views-admin.js b/core/modules/views_ui/js/views-admin.js
index d0204e6d1cf656041bc8fcf185d36d804178c4cc..c423c09fb6f718bbd6e9be523774a959f1a157db 100644
--- a/core/modules/views_ui/js/views-admin.js
+++ b/core/modules/views_ui/js/views-admin.js
@@ -861,7 +861,7 @@
    */
   Drupal.viewsUi.Checkboxifier.prototype.clickHandler = function (e) {
     this.$button
-      .trigger('mousedown')
+      .trigger('click')
       .trigger('submit');
   };