diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_paging.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_paging.yml
new file mode 100644
index 0000000000..841afcedc6
--- /dev/null
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_paging.yml
@@ -0,0 +1,330 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - node
+    - user
+id: test_argument_paging
+label: test_argument_paging
+module: views
+description: ''
+tag: ''
+base_table: node_field_data
+base_field: nid
+core: 8.x
+display:
+  default:
+    display_plugin: default
+    id: default
+    display_title: Master
+    position: 0
+    display_options:
+      access:
+        type: perm
+        options:
+          perm: 'access content'
+      cache:
+        type: none
+        options: {  }
+      query:
+        type: views_query
+        options:
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_comment: ''
+          query_tags: {  }
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Apply
+          reset_button: false
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: true
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      pager:
+        type: full
+        options:
+          items_per_page: 5
+          offset: 0
+          id: 0
+          total_pages: null
+          expose:
+            items_per_page: false
+            items_per_page_label: 'Items per page'
+            items_per_page_options: '5, 10, 25, 50'
+            items_per_page_options_all: false
+            items_per_page_options_all_label: '- All -'
+            offset: false
+            offset_label: Offset
+          tags:
+            previous: '< previous'
+            next: 'next >'
+            first: '<< first'
+            last: 'last >>'
+          quantity: 9
+      style:
+        type: table
+      row:
+        type: fields
+      fields:
+        uid:
+          id: uid
+          table: node_field_data
+          field: uid
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: 'Authored by'
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          link_to_user: true
+          entity_type: node
+          entity_field: uid
+          plugin_id: user
+        nid:
+          id: nid
+          table: node
+          field: nid
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: 'Node ID'
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: number_integer
+          settings:
+            thousand_separator: ''
+            prefix_suffix: true
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: node
+          entity_field: nid
+          plugin_id: field
+        type:
+          id: type
+          table: node
+          field: type
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Type
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: target_id
+          type: entity_reference_label
+          settings:
+            link: true
+          group_column: target_id
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: node
+          entity_field: type
+          plugin_id: field
+      filters: {  }
+      sorts: {  }
+      title: test_argument_paging
+      header: {  }
+      footer: {  }
+      empty: {  }
+      relationships: {  }
+      arguments:
+        type:
+          id: type
+          table: node
+          field: type
+          relationship: none
+          group_type: group
+          admin_label: ''
+          default_action: ignore
+          exception:
+            value: all
+            title_enable: false
+            title: All
+          title_enable: false
+          title: ''
+          default_argument_type: fixed
+          default_argument_options:
+            argument: ''
+          default_argument_skip_url: false
+          summary_options:
+            base_path: ''
+            count: true
+            items_per_page: 25
+            override: false
+          summary:
+            sort_order: asc
+            number_of_records: 0
+            format: default_summary
+          specify_validation: false
+          validate:
+            type: none
+            fail: 'not found'
+          validate_options: {  }
+          glossary: false
+          limit: 0
+          case: none
+          path_case: none
+          transform_dash: false
+          break_phrase: false
+          entity_type: node
+          entity_field: type
+          plugin_id: string
+      display_extenders: {  }
+      filter_groups:
+        operator: AND
+        groups: {  }
+    cache_metadata:
+      contexts:
+        0: node_view_grants
+        1: user
+        3: cache.context.url
+        4: language
+      cacheable: false
+  page_1:
+    display_plugin: page
+    id: page_1
+    display_title: Page
+    position: 1
+    display_options:
+      display_extenders: {  }
+      path: test_argument_paging
+    cache_metadata:
+      contexts:
+        0: node_view_grants
+        1: user
+        3: cache.context.url
+        4: language
+      cacheable: false
diff --git a/core/modules/views_ui/src/Tests/PreviewTest.php b/core/modules/views_ui/src/Tests/PreviewTest.php
index 657c8704fc..eb70feb6d5 100644
--- a/core/modules/views_ui/src/Tests/PreviewTest.php
+++ b/core/modules/views_ui/src/Tests/PreviewTest.php
@@ -17,7 +17,14 @@ class PreviewTest extends UITestBase {
    *
    * @var array
    */
-  public static $testViews = ['test_preview', 'test_preview_error', 'test_pager_full', 'test_mini_pager', 'test_click_sort'];
+  public static $testViews = [
+    'test_preview',
+    'test_preview_error',
+    'test_pager_full',
+    'test_mini_pager',
+    'test_click_sort',
+    'test_argument_paging',
+  ];
 
   /**
    * Tests contextual links in the preview form.
@@ -239,6 +246,42 @@ public function testPreviewWithPagersUI() {
     $this->assertTrue($elements[2]->a, 'Link to next page found.');
   }
 
+  /**
+   * Tests paging in the preview form, with contextual filters set.
+   */
+  public function testPreviewPagingWithContextualFilters() {
+    // Create 10 page nodes.
+    $this->drupalCreateContentType(['type' => 'page']);
+    for ($i = 0; $i < 10; $i++) {
+      $this->drupalCreateNode(['type' => 'page']);
+    }
+    // Create 10 article nodes.
+    $this->drupalCreateContentType(['type' => 'article']);
+    for ($i = 0; $i < 10; $i++) {
+      $this->drupalCreateNode(['type' => 'article']);
+    }
+
+    // Get the preview.
+    $this->drupalGet('admin/structure/views/view/test_argument_paging/edit');
+    $this->assertResponse(200);
+    $this->drupalPostForm(NULL, $edit = [], 'Update preview');
+
+    // Set the contextual filter to show 'page' nodes.
+    $this->drupalPostForm(NULL, $edit = ['view_args' => 'page'], 'Update preview');
+
+    // Check pager is there.
+    $elements = $this->xpath('//ul[contains(@class, :class)]/li', [':class' => 'pager__items']);
+    $this->assertTrue(!empty($elements), 'Full pager found.');
+
+    // Navigate to next page.
+    $elements = $this->xpath('//li[contains(@class, :class)]/a', [':class' => 'pager__item--next']);
+    $this->clickPreviewLinkAJAX($elements[0]['href'], 5);
+    $this->verbose($this->content);
+
+    // Check contextual filter settings are retained.
+    $this->assertFieldByName('view_args', 'page', 'Contextual filter is set to \'page\'');
+  }
+
   /**
    * Tests the additional information query info area.
    */
diff --git a/core/modules/views_ui/src/ViewPreviewForm.php b/core/modules/views_ui/src/ViewPreviewForm.php
index 787527baf8..97ed416c2c 100644
--- a/core/modules/views_ui/src/ViewPreviewForm.php
+++ b/core/modules/views_ui/src/ViewPreviewForm.php
@@ -41,17 +41,21 @@ public function form(array $form, FormStateInterface $form_state) {
     ];
 
     // Add the arguments textfield
+    if (!$form_state->isValueEmpty('view_args')) {
+      $preview_args = $form_state->getValue('view_args');
+    }
+    else {
+      $preview_args = \Drupal::request()->query->get('_preview_args');
+    }
     $form['controls']['view_args'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Preview with contextual filters:'),
       '#description' => $this->t('Separate contextual filter values with a "/". For example, %example.', ['%example' => '40/12/10']),
       '#id' => 'preview-args',
+      '#default_value' => $preview_args,
     ];
 
-    $args = [];
-    if (!$form_state->isValueEmpty('view_args')) {
-      $args = explode('/', $form_state->getValue('view_args'));
-    }
+    $args = !empty($preview_args) ? explode('/', $preview_args) : [];
 
     $user_input = $form_state->getUserInput();
     if ($form_state->get('show_preview') || !empty($user_input['js'])) {
diff --git a/core/modules/views_ui/src/ViewUI.php b/core/modules/views_ui/src/ViewUI.php
index 6b49fdc92d..e248f9e65b 100644
--- a/core/modules/views_ui/src/ViewUI.php
+++ b/core/modules/views_ui/src/ViewUI.php
@@ -14,9 +14,6 @@
 use Drupal\views\Plugin\views\query\Sql;
 use Drupal\views\Entity\View;
 use Drupal\views\ViewEntityInterface;
-use Symfony\Cmf\Component\Routing\RouteObjectInterface;
-use Symfony\Component\HttpFoundation\ParameterBag;
-use Symfony\Component\HttpFoundation\Request;
 
 /**
  * Stores UI related temporary settings.
@@ -512,9 +509,7 @@ public function endQueryCapture() {
   }
 
   public function renderPreview($display_id, $args = []) {
-    // Save the current path so it can be restored before returning from this function.
-    $request_stack = \Drupal::requestStack();
-    $current_request = $request_stack->getCurrentRequest();
+    $request = \Drupal::request();
     $executable = $this->getExecutable();
 
     // Determine where the query and performance statistics should be output.
@@ -543,7 +538,7 @@ public function renderPreview($display_id, $args = []) {
       // If we're clicking on links in a preview, though, we could actually
       // have some input in the query parameters, so we merge request() and
       // query() to ensure we get it all.
-      $exposed_input = array_merge(\Drupal::request()->request->all(), \Drupal::request()->query->all());
+      $exposed_input = array_merge($request->request->all(), $request->query->all());
       foreach (['view_name', 'view_display_id', 'view_args', 'view_path', 'view_dom_id', 'pager_element', 'view_base_path', AjaxResponseSubscriber::AJAX_REQUEST_PARAMETER, 'ajax_page_state', 'form_id', 'form_build_id', 'form_token'] as $key) {
         if (isset($exposed_input[$key])) {
           unset($exposed_input[$key]);
@@ -565,23 +560,13 @@ public function renderPreview($display_id, $args = []) {
       }
 
       // Make view links come back to preview.
-
-      // Also override the current path so we get the pager, and make sure the
-      // Request object gets all of the proper values from $_SERVER.
-      $request = Request::createFromGlobals();
-      $request->attributes->set(RouteObjectInterface::ROUTE_NAME, 'entity.view.preview_form');
-      $request->attributes->set(RouteObjectInterface::ROUTE_OBJECT, \Drupal::service('router.route_provider')->getRouteByName('entity.view.preview_form'));
-      $request->attributes->set('view', $this->storage);
-      $request->attributes->set('display_id', $display_id);
-      $raw_parameters = new ParameterBag();
-      $raw_parameters->set('view', $this->id());
-      $raw_parameters->set('display_id', $display_id);
-      $request->attributes->set('_raw_variables', $raw_parameters);
-
       foreach ($args as $key => $arg) {
         $request->attributes->set('arg_' . $key, $arg);
       }
-      $request_stack->push($request);
+      // Store contextual filters in a request query parameter for the pager.
+      if ($args) {
+        $request->query->set('_preview_args', implode('/', $args));
+      }
 
       // Suppress contextual links of entities within the result set during a
       // Preview.
@@ -818,11 +803,6 @@ public function renderPreview($display_id, $args = []) {
       ];
     }
 
-    // Ensure that we just remove an additional request we pushed earlier.
-    // This could happen if $errors was not empty.
-    if ($request_stack->getCurrentRequest() != $current_request) {
-      $request_stack->pop();
-    }
     return $output;
   }