diff --git a/core/modules/views/lib/Drupal/views/Tests/Wizard/BasicTest.php b/core/modules/views/lib/Drupal/views/Tests/Wizard/BasicTest.php
index dbf48ff..e8a6acc 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Wizard/BasicTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Wizard/BasicTest.php
@@ -34,9 +34,9 @@ function testViewsWizardAndListing() {
     $view1['name'] = strtolower($this->randomName(16));
     $view1['description'] = $this->randomName(16);
     $view1['page[create]'] = FALSE;
-    $this->drupalPost('admin/structure/views/add', $view1, t('Save & exit'));
+    $this->drupalPost('admin/structure/views/add', $view1, t('Save & edit'));
     $this->assertResponse(200);
-    $this->assertText(t('Your view was saved. You may edit it from the list below.'));
+    $this->drupalGet('admin/structure/views');
     $this->assertText($view1['human_name']);
     $this->assertText($view1['description']);
     // @todo For now, clone is being left to config.module to solve.
@@ -62,7 +62,8 @@ function testViewsWizardAndListing() {
     $view2['page[path]'] = $this->randomName(16);
     $view2['page[feed]'] = 1;
     $view2['page[feed_properties][path]'] = $this->randomName(16);
-    $this->drupalPost('admin/structure/views/add', $view2, t('Save & exit'));
+    $this->drupalPost('admin/structure/views/add', $view2, t('Save & edit'));
+    $this->drupalGet($view2['page[path]']);
     $this->assertResponse(200);
 
     // Since the view has a page, we expect to be automatically redirected to
@@ -105,7 +106,8 @@ function testViewsWizardAndListing() {
     $view3['page[path]'] = $this->randomName(16);
     $view3['block[create]'] = 1;
     $view3['block[title]'] = $this->randomName(16);
-    $this->drupalPost('admin/structure/views/add', $view3, t('Save & exit'));
+    $this->drupalPost('admin/structure/views/add', $view3, t('Save & edit'));
+    $this->drupalGet($view3['page[path]']);
     $this->assertResponse(200);
 
     // Make sure the view only displays the node we expect.
diff --git a/core/modules/views/lib/Drupal/views/Tests/Wizard/ItemsPerPageTest.php b/core/modules/views/lib/Drupal/views/Tests/Wizard/ItemsPerPageTest.php
index 3e69105..ea6ca83 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Wizard/ItemsPerPageTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Wizard/ItemsPerPageTest.php
@@ -53,7 +53,8 @@ function testItemsPerPage() {
     $view['block[create]'] = 1;
     $view['block[title]'] = $this->randomName(16);
     $view['block[items_per_page]'] = 3;
-    $this->drupalPost('admin/structure/views/add', $view, t('Save & exit'));
+    $this->drupalPost('admin/structure/views/add', $view, t('Save & edit'));
+    $this->drupalGet($view['page[path]']);
     $this->assertResponse(200);
 
     // Make sure the page display shows the nodes we expect, and that they
diff --git a/core/modules/views/lib/Drupal/views/Tests/Wizard/MenuTest.php b/core/modules/views/lib/Drupal/views/Tests/Wizard/MenuTest.php
index e7ad92b..f829378 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Wizard/MenuTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Wizard/MenuTest.php
@@ -35,8 +35,7 @@ function testMenus() {
     $view['page[link]'] = 1;
     $view['page[link_properties][menu_name]'] = 'main';
     $view['page[link_properties][title]'] = $this->randomName(16);
-    $this->drupalPost('admin/structure/views/add', $view, t('Save & exit'));
-    $this->assertResponse(200);
+    $this->drupalPost('admin/structure/views/add', $view, t('Save & edit'));
 
     // Make sure there is a link to the view from the front page (where we
     // expect the main menu to display).
diff --git a/core/modules/views/lib/Drupal/views/Tests/Wizard/SortingTest.php b/core/modules/views/lib/Drupal/views/Tests/Wizard/SortingTest.php
index 888d60c..e0debcf 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Wizard/SortingTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Wizard/SortingTest.php
@@ -39,7 +39,8 @@ function testSorting() {
     $view1['page[create]'] = 1;
     $view1['page[title]'] = $this->randomName(16);
     $view1['page[path]'] = $this->randomName(16);
-    $this->drupalPost('admin/structure/views/add', $view1, t('Save & exit'));
+    $this->drupalPost('admin/structure/views/add', $view1, t('Save & edit'));
+    $this->drupalGet($view1['page[path]']);
     $this->assertResponse(200);
 
     // Make sure the view shows the nodes in the expected order.
@@ -63,7 +64,8 @@ function testSorting() {
     $view2['page[create]'] = 1;
     $view2['page[title]'] = $this->randomName(16);
     $view2['page[path]'] = $this->randomName(16);
-    $this->drupalPost('admin/structure/views/add', $view2, t('Save & exit'));
+    $this->drupalPost('admin/structure/views/add', $view2, t('Save & edit'));
+    $this->drupalGet($view2['page[path]']);
     $this->assertResponse(200);
 
     // Make sure the view shows the nodes in the expected order.
diff --git a/core/modules/views/lib/Drupal/views/Tests/Wizard/TaggedWithTest.php b/core/modules/views/lib/Drupal/views/Tests/Wizard/TaggedWithTest.php
index cf3d19e..e5d7b83 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Wizard/TaggedWithTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Wizard/TaggedWithTest.php
@@ -128,11 +128,11 @@ function testTaggedWith() {
     $view1['page[create]'] = 1;
     $view1['page[title]'] = $this->randomName(16);
     $view1['page[path]'] = $this->randomName(16);
-    $this->drupalPost(NULL, $view1, t('Save & exit'));
-    $this->assertResponse(200);
+    $this->drupalPost(NULL, $view1, t('Save & edit'));
     // Visit the page and check that the nodes we expect are present and the
     // ones we don't expect are absent.
     $this->drupalGet($view1['page[path]']);
+    $this->assertResponse(200);
     $this->assertText($node_tag1_title);
     $this->assertText($node_tag1_tag2_title);
     $this->assertNoText($node_no_tags_title);
@@ -150,7 +150,7 @@ function testTaggedWith() {
     $view2['page[create]'] = 1;
     $view2['page[title]'] = $this->randomName(16);
     $view2['page[path]'] = $this->randomName(16);
-    $this->drupalPost(NULL, $view2, t('Save & exit'));
+    $this->drupalPost(NULL, $view2, t('Save & edit'));
     $this->assertResponse(200);
     $this->drupalGet($view2['page[path]']);
     $this->assertNoText($node_tag1_title);
diff --git a/core/modules/views/views_ui/lib/Drupal/views_ui/ViewAddFormController.php b/core/modules/views/views_ui/lib/Drupal/views_ui/ViewAddFormController.php
index b83ed91..f9c5c2c 100644
--- a/core/modules/views/views_ui/lib/Drupal/views_ui/ViewAddFormController.php
+++ b/core/modules/views/views_ui/lib/Drupal/views_ui/ViewAddFormController.php
@@ -9,6 +9,7 @@
 
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\views\Plugin\views\wizard\WizardPluginBase;
+use Drupal\views\Plugin\views\wizard\WizardException;
 
 /**
  * Form controller for the Views edit form.
@@ -117,16 +118,7 @@ public function form(array $form, array &$form_state, EntityInterface $view) {
    */
   protected function actions(array $form, array &$form_state) {
     $actions = parent::actions($form, $form_state);
-    $actions['submit']['#value'] = t('Save & exit');
-    $actions['continueAndEdit'] = array(
-      '#value' => t('Continue & edit'),
-      '#validate' => array(
-        array($this, 'validate'),
-      ),
-      '#submit' => array(
-        array($this, 'continueAndEdit'),
-      ),
-    );
+    $actions['submit']['#value'] = t('Save & edit');
 
     $actions['cancel'] = array(
       '#value' => t('Cancel'),
@@ -160,6 +152,7 @@ public function submit(array $form, array &$form_state) {
     try {
       $view = $form_state['wizard_instance']->create_view($form, $form_state);
     }
+    // @todo Figure out whether it really makes sense to throw and catch exceptions on the wizard.
     catch (WizardException $e) {
       drupal_set_message($e->getMessage(), 'error');
       $form_state['redirect'] = 'admin/structure/views';
@@ -167,50 +160,7 @@ public function submit(array $form, array &$form_state) {
     }
     $view->save();
 
-    $form_state['redirect'] = 'admin/structure/views';
-    if (!empty($view->get('executable')->displayHandlers['page_1'])) {
-      $display = $view->get('executable')->displayHandlers['page_1'];
-      if ($display->hasPath()) {
-        $one_path = $display->getOption('path');
-        if (strpos($one_path, '%') === FALSE) {
-          $form_state['redirect'] = $one_path;  // PATH TO THE VIEW IF IT HAS ONE
-          return;
-        }
-      }
-    }
-    drupal_set_message(t('Your view was saved. You may edit it from the list below.'));
-  }
-
-  /**
-   * Form submission handler for the 'continue' action.
-   *
-   * @param array $form
-   *   An associative array containing the structure of the form.
-   * @param array $form_state
-   *   A reference to a keyed array containing the current state of the form.
-   */
-  public function continueAndEdit(array $form, array &$form_state) {
-    try {
-      $view = $form_state['wizard_instance']->create_view($form, $form_state);
-    }
-    catch (WizardException $e) {
-      drupal_set_message($e->getMessage(), 'error');
-      $form_state['redirect'] = 'admin/structure/views';
-      return;
-    }
-    // Just cache it temporarily to edit it.
-    views_ui_cache_set($view);
-
-    // If there is a destination query, ensure we still redirect the user to the
-    // edit view page, and then redirect the user to the destination.
-    // @todo: Revisit this when http://drupal.org/node/1668866 is in.
-    $destination = array();
-    $query = drupal_container()->get('request')->query;
-    if ($query->has('destination')) {
-      $destination = drupal_get_destination();
-      $query->remove('destination');
-    }
-    $form_state['redirect'] = array('admin/structure/views/view/' . $view->get('name'), array('query' => $destination));
+    $form_state['redirect'] = array('admin/structure/views/view/' . $view->get('name'));
   }
 
   /**