diff --git a/core/lib/Drupal/Core/Entity/EntityForm.php b/core/lib/Drupal/Core/Entity/EntityForm.php
index 6d61d0c..c857190 100644
--- a/core/lib/Drupal/Core/Entity/EntityForm.php
+++ b/core/lib/Drupal/Core/Entity/EntityForm.php
@@ -165,7 +165,7 @@ public function processForm($element, FormStateInterface $form_state, $form) {
   public function afterBuild(array $element, FormStateInterface $form_state) {
     // Rebuild the entity if #after_build is being called as part of a form
     // rebuild, i.e. if we are processing input.
-    if ($form_state->isProcessingInput()) {
+    if ($form_state->isProcessingInput() && $form_state->isSubmitted()) {
       $this->entity = $this->buildEntity($element, $form_state);
     }
 
diff --git a/core/modules/field_ui/src/Form/EntityDisplayFormBase.php b/core/modules/field_ui/src/Form/EntityDisplayFormBase.php
index c746bc9..522dce8 100644
--- a/core/modules/field_ui/src/Form/EntityDisplayFormBase.php
+++ b/core/modules/field_ui/src/Form/EntityDisplayFormBase.php
@@ -336,7 +336,7 @@ protected function buildFieldRow(FieldDefinitionInterface $field_definition, arr
 
     // Base button element for the various plugin settings actions.
     $base_button = array(
-      '#submit' => array(array($this, 'multistepSubmit')),
+      '#submit' => array('::multistepSubmit'),
       '#ajax' => array(
         'callback' => array($this, 'multistepAjax'),
         'wrapper' => 'field-display-overview-wrapper',
@@ -627,8 +627,8 @@ public function multistepSubmit($form, FormStateInterface $form_state) {
         // Set the field back to 'non edit' mode, and 'updated submitted values".
         $form_state->set('plugin_settings_edit', NULL);
         $form_state->set('plugin_settings_update', $trigger['#field_name']);
-        $this->entity = $this->buildEntity($form, $form_state);
-        $form_state->getFormObject()->setEntity($this->entity);
+//        $this->entity = $this->buildEntity($form, $form_state);
+//        $form_state->getFormObject()->setEntity($this->entity);
         break;
 
       case 'cancel':