diff --git a/core/modules/field_ui/field_ui.module b/core/modules/field_ui/field_ui.module
index 8a8674c..e833617 100644
--- a/core/modules/field_ui/field_ui.module
+++ b/core/modules/field_ui/field_ui.module
@@ -264,6 +264,24 @@ function field_ui_entity_bundle_create($entity_type, $bundle) {
   // When a new bundle is created, the menu needs to be rebuilt to add our
   // menu item tabs.
   Drupal::state()->set('menu_rebuild_needed', TRUE);
+
+  // Add extra fields to default form display mode.
+  $form_display = entity_get_form_display($entity_type, $bundle, 'default');
+  $form_extra_fields = field_info_extra_fields($entity_type, $bundle, 'form');
+  foreach ($form_extra_fields as $field_name => $settings) {
+    if (!isset($settings['visible']) || $settings['visible'] != FALSE) {
+      $form_display->setComponent($field_name, array('weight' => $settings['weight']))->save();
+    }
+  }
+
+  // Add extra fields to default display mode.
+  $display = entity_get_display($entity_type, $bundle, 'default');
+  $display_extra_fields = field_info_extra_fields($entity_type, $bundle, 'display');
+  foreach ($display_extra_fields as $field_name => $settings) {
+    if (!isset($settings['visible']) || $settings['visible'] != FALSE) {
+      $display->setComponent($field_name, array('weight' => $settings['weight']))->save();
+    }
+  }
 }
 
 /**