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 d8db8ef..a65f002 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
@@ -113,11 +113,21 @@ public function form(array $form, array &$form_state, EntityInterface $view) {
   }
 
   /**
+   * Overrides Drupal\Core\Entity\EntityFormController::actionsElement().
+   */
+  protected function actionsElement(array $form, array &$form_state) {
+    $element = parent::actionsElement($form, $form_state);
+    unset($element['submit']['#button_type']);
+    return $element;
+  }
+
+  /**
    * Overrides Drupal\Core\Entity\EntityFormController::actions().
    */
   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(
@@ -126,6 +136,7 @@ protected function actions(array $form, array &$form_state) {
       '#submit' => array(
         array($this, 'continueAndEdit'),
       ),
+      '#weight' => -10,
     );
 
     $actions['cancel'] = array(