diff --git a/src/Form/IndexForm.php b/src/Form/IndexForm.php
index b4cd5f3..f844e5d 100644
--- a/src/Form/IndexForm.php
+++ b/src/Form/IndexForm.php
@@ -570,4 +570,25 @@ class IndexForm extends EntityForm {
     $form_state->setRedirect('entity.search_api_index.delete', array('search_api_index' => $this->getEntity()->id()));
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function actions(array $form, FormStateInterface $form_state) {
+    $actions = parent::actions($form, $form_state);
+    $actions['save_edit'] = array(
+      '#type' => 'submit',
+      '#value' => $this->t('Save and edit'),
+      '#submit' => array('::submitForm', '::save', '::redirectToFieldsForm'),
+      '#button_type' => 'primary',
+    );
+
+    return $actions;
+  }
+
+  /**
+   * Redirects to the fields config form when submitting with "Save and edit".
+   */
+  public function redirectToFieldsForm(array $form, FormStateInterface $form_state) {
+    $form_state->setRedirect('entity.search_api_index.fields', array('search_api_index' => $this->getEntity()->id()));
+  }
 }