diff --git a/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationSettingsTest.php b/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationSettingsTest.php
index 127f7ea..5ee2c4e 100644
--- a/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationSettingsTest.php
+++ b/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationSettingsTest.php
@@ -39,7 +39,7 @@ function setUp() {
     $this->drupalCreateContentType(array('type' => 'page'));
     $this->container->get('comment.manager')->addDefaultField('node', 'article', 'comment_article');
 
-    $admin_user = $this->drupalCreateUser(array('administer languages', 'administer content translation', 'administer content types', 'administer comment fields'));
+    $admin_user = $this->drupalCreateUser(array('administer languages', 'administer content translation', 'administer content types', 'administer comment fields', 'administer node fields'));
     $this->drupalLogin($admin_user);
   }
 
@@ -151,4 +151,44 @@ protected function assertSettings($entity_type, $bundle, $enabled, $edit) {
     return $this->assertEqual(content_translation_enabled($entity_type, $bundle), $enabled, $message);
   }
 
+  /**
+   * Tests that field instance setting depends on bundle translatability.
+   */
+  function testFieldTranslatableSettingsUI() {
+
+    // At least one field needs to be translatable to enable article for
+    // translation. Create an extra field to be used for this purpose.
+    $field = array(
+      'name' => 'article_text',
+      'entity_type' => 'node',
+      'type' => 'text',
+    );
+    entity_create('field_entity', $field)->save();
+    $instance = array(
+      'field_name' => 'article_text',
+      'entity_type' => 'node',
+      'bundle' => 'article',
+    );
+    entity_create('field_instance', $instance)->save();
+
+    // Tests that field instance doesn't have translatable setting if bundle
+    // is not translatable.
+    $path = 'admin/structure/types/manage/article/fields/node.article.body/field';
+    $this->drupalGet($path);
+    $this->assertText('To enable translation of this field, enable language support for this type.', 'No translatable setting for field.');
+
+    // Tests that field instance has translatable setting if bundle is
+    // translatable. Note: this field instance is not translatable when
+    // enable bundle translatability.
+    $edit = array(
+      'entity_types[node]' => TRUE,
+      'settings[node][article][settings][language][language_show]' => TRUE,
+      'settings[node][article][translatable]' => TRUE,
+      'settings[node][article][fields][article_text]' => TRUE,
+    );
+    $this->assertSettings('node', 'article', TRUE, $edit);
+    $this->drupalGet($path);
+    $this->assertNoText('To enable translation of this field, enable language support for this type.', 'No translatable setting for field.');
+  }
+
 }
diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldEditForm.php b/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldEditForm.php
index 827d44f..ebbbf9b 100644
--- a/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldEditForm.php
+++ b/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldEditForm.php
@@ -91,6 +91,7 @@ public function buildForm(array $form, array &$form_state, FieldInstanceInterfac
 
     $field = $this->instance->getField();
     $form['#field'] = $field;
+    $form['#bundle'] = $this->instance->bundle;
 
     $description = '<p>' . $this->t('These settings apply to the %field field everywhere it is used. These settings impact the way that data is stored in the database and cannot be changed once data has been created.', array('%field' => $this->instance->label())) . '</p>';