diff --git a/core/modules/views/views.module b/core/modules/views/views.module
index 50d988d..d2bbe00 100644
--- a/core/modules/views/views.module
+++ b/core/modules/views/views.module
@@ -1356,8 +1356,7 @@ function views_exposed_form($form, &$form_state) {
     }
   }
 
-  $form['actions'] = array('#type' => 'actions');
-  $form['actions']['submit'] = array(
+  $form['submit'] = array(
     // Prevent from showing up in $_GET.
     '#name' => '',
     '#type' => 'submit',
diff --git a/core/modules/views/views.theme.inc b/core/modules/views/views.theme.inc
index df9fc79..48507a7 100644
--- a/core/modules/views/views.theme.inc
+++ b/core/modules/views/views.theme.inc
@@ -1073,11 +1073,19 @@ function template_preprocess_views_exposed_form(&$vars) {
   // Include basic theming for exposed forms.
   $form['#attached']['library'][] = array('views', 'views.exposed-form');
 
-  foreach ($form['#info'] as $id => $info) {
+  foreach ($form['#info'] as $info) {
     if (!empty($info['label'])) {
       $form[$info['value']]['#title'] = $info['label'];
     }
   }
+
+  // Wrap up all the checkboxes into a single element.
+  foreach ($form['#info'] as $info) {
+    if (isset($form[$info['value']]) && $form[$info['value']]['#type'] == 'checkbox') {
+      $form['checkboxes'][] = $form[$info['value']];
+      unset($form[$info['value']]);
+    }
+  }
 }
 
 /**