diff --git a/core/modules/views/templates/views-exposed-form.html.twig b/core/modules/views/templates/views-exposed-form.html.twig
index 5291197..9ee54e7 100644
--- a/core/modules/views/templates/views-exposed-form.html.twig
+++ b/core/modules/views/templates/views-exposed-form.html.twig
@@ -11,13 +11,14 @@
  *   - description: The sanitized description of the widget.
  *   - widget: The widget itself.
  *   - index: the widget's row index.
- * - sort_by: An optional select element to sort the view by fields.
- * - sort_order: An optional select element with ascending or
- *   descending order options.
- * - items_per_page: An optional select element for the available items per page.
- * - offset: An optional textfield to define the offset of the view.
- * - reset_button: An optional button to reset the exposed filter applied.
- * - form: The form element.
+ * - form: A render element representing the form.
+ *   - sort_by: An optional select element to sort the view by fields.
+ *   - sort_order: An optional select element with ascending or
+ *     descending order options.
+ *   - items_per_page: An optional select element for the available items per page.
+ *   - offset: An optional textfield to define the offset of the view.
+ *   - reset_button: An optional button to reset the exposed filter applied.
+ *   - form: The form element.
  *
  * @see template_preprocess()
  * @see template_preprocess_views_exposed_form()
@@ -56,30 +57,30 @@
         {% endif %}
       </div>
     {% endfor %}
-    {% if sort_by %}
+    {% if form.sort_by %}
       <div class="views-exposed-widget views-widget-sort-by">
-        {{ sort_by }}
+        {{ form.sort_by }}
       </div>
       <div class="views-exposed-widget views-widget-sort-order">
-        {{ sort_order }}
+        {{ form.sort_order }}
       </div>
     {% endif %}
-    {% if items_per_page %}
+    {% if form.items_per_page %}
       <div class="views-exposed-widget views-widget-per-page">
-        {{ items_per_page }}
+        {{ form.items_per_page }}
       </div>
     {% endif %}
-    {% if offset %}
+    {% if form.offset %}
       <div class="views-exposed-widget views-widget-offset">
-        {{ offset }}
+        {{ form.offset }}
       </div>
     {% endif %}
     <div class="views-exposed-widget views-submit-button">
       {{ form }}
     </div>
-    {% if reset_button %}
+    {% if form.reset_button %}
       <div class="views-exposed-widget views-reset-button">
-        {{ reset_button }}
+        {{ form.reset_button }}
       </div>
     {% endif %}
   </div>
diff --git a/core/modules/views/views.theme.inc b/core/modules/views/views.theme.inc
index 017daf8..a046b17 100644
--- a/core/modules/views/views.theme.inc
+++ b/core/modules/views/views.theme.inc
@@ -969,6 +969,8 @@ function template_preprocess_views_exposed_form(&$vars) {
     }
 
     $vars['widgets'][$id] = $widget;
+    // Unset the widget, so that it doesn't get rendered twice.
+    unset($form[$info['value']]);
   }
 
   // Wrap up all the checkboxes we set aside into a widget.
@@ -980,20 +982,6 @@ function template_preprocess_views_exposed_form(&$vars) {
     $widget->widget = $checkboxes;
     $vars['widgets']['checkboxes'] = $widget;
   }
-
-  if (isset($form['sort_by'])) {
-    $vars['sort_by'] = $form['sort_by'];
-    $vars['sort_order'] = $form['sort_order'];
-  }
-  if (isset($form['items_per_page'])) {
-    $vars['items_per_page'] = $form['items_per_page'];
-  }
-  if (isset($form['offset'])) {
-    $vars['offset'] = $form['offset'];
-  }
-  if (isset($form['reset'])) {
-    $vars['reset_button'] = $form['reset'];
-  }
 }
 
 /**