diff --git a/core/modules/content_translation/content_translation.admin.inc b/core/modules/content_translation/content_translation.admin.inc
index cea6b2e..180a6d2 100644
--- a/core/modules/content_translation/content_translation.admin.inc
+++ b/core/modules/content_translation/content_translation.admin.inc
@@ -191,6 +191,20 @@ function _content_translation_preprocess_language_content_settings_table(&$varia
       array_unshift($rows[$bundle]['data'], $translatable);
 
       $rows[$bundle]['data'][1]['data']['#prefix'] = '<label for="' . $checkbox_id . '">';
+      $rows[$bundle]['data'][2]['data']['language']['language_show']['#description'] = t('Some default language options are hidden if the language selector is not shown.');
+      // Add CSS classes for easier JS selection.
+      $rows[$bundle]['data'][2]['data']['language']['language_show'] = array_merge_recursive($rows[$bundle]['data'][2]['data']['language']['language_show'], array(
+        '#attributes' => array(
+          'class' => array('language-show-checkbox'),
+        ),
+      ));
+      if (isset($rows[$bundle]['data'][2]['data']['language']['langcode'])) {
+        $rows[$bundle]['data'][2]['data']['language']['langcode'] = array_merge_recursive($rows[$bundle]['data'][2]['data']['language']['langcode'], array(
+          '#attributes' => array(
+            'class' => array('langcode-select'),
+          ),
+        ));
+      }
     }
     else {
       $translatable = array(
diff --git a/core/modules/content_translation/content_translation.admin.js b/core/modules/content_translation/content_translation.admin.js
index 2ca7496..9463f2c 100644
--- a/core/modules/content_translation/content_translation.admin.js
+++ b/core/modules/content_translation/content_translation.admin.js
@@ -128,4 +128,75 @@
     }
   };
 
+  /**
+   * Removes unusable locked languages when not showing language selector.
+   *
+   * This behavior gets attached on the relevant entity edit form and the
+   * translation entity summary form.
+   */
+  Drupal.behaviors.lockedSelector = {
+    attach: function (context) {
+      // Show a custom message for the changed language options.
+      Drupal.theme.tableOptionsChangedWarning = function () {
+        return '<div id="locked-language-warning" class="messages warning">' + Drupal.t('To use a locked language, with translation enabled, the language selector needs to be shown.') + '</div>';
+      };
+
+      // Declare the function in scope and reuse it later.
+      var filterAvailableLanguages = function ($languageSelector, $checkbox, $translatable) {
+        // Get the list of all languages and unlocked languages based on the
+        // original language selector options.
+        var $originalOptions = $languageSelector.data('originalOptions');
+        if (typeof ($originalOptions) !== 'undefined') {
+          var $unlockedOptions = $originalOptions.filter(function (index) { return !/^- .* -$/.test(this.text); });
+          if ($translatable.size() === 0 || $translatable.is(':checked')) {
+            if ($checkbox.is(':checked')) {
+              $languageSelector.html($originalOptions).siblings('.description').find('.hidden-languages').hide();
+            }
+            else {
+              // Warn the user if a locked language was selected.
+              if (/^- .* -$/.test($languageSelector.find(':selected').text())) {
+                // Place only one warning block per page.
+                if (!$('#locked-language-warning').size()) {
+                  $(Drupal.theme('tableOptionsChangedWarning')).insertBefore($('.form-type-vertical-tabs')).hide().fadeIn('slow');
+                }
+              }
+              $languageSelector.html($unlockedOptions).siblings('.description').find('.hidden-languages').show();
+            }
+          }
+          else {
+            $languageSelector.html($originalOptions).siblings('.description').find('.hidden-languages').hide();
+          }
+        }
+      };
+
+      var processSelectors = function ($container) {
+        if ($container.size()) {
+          // Store the data about original options in the language selector
+          // Do it only once to avoid losing options
+          $container.once('locked-selector-options').each(function (index, element) {
+            $('.langcode-select', element).data('originalOptions', $('option', $('.langcode-select', element)));
+          });
+          $container.each(function (index, element) {
+            var $languageSelector = $('.langcode-select', element);
+            var $checkbox = $('.language-show-checkbox', element);
+
+            // Execute the function at the beginning and whenever the relevant
+            // checkbox is clicked.
+            $checkbox.on('click', function (e) {
+              filterAvailableLanguages($languageSelector, $checkbox, $translatable);
+            });
+            filterAvailableLanguages($languageSelector, $checkbox, $translatable);
+          });
+        }
+      };
+
+      // Determine the kind of form we are dealing with.
+      var $container = $('.bundle-settings .operations, .details-wrapper', context);
+      var $translatable = $('.translation-enabled-checkbox').once('locked-selector-options').on('click', function (e) {
+        processSelectors($container);
+      });
+      processSelectors($container);
+    }
+  };
+
 })(jQuery, Drupal, drupalSettings);
diff --git a/core/modules/content_translation/content_translation.module b/core/modules/content_translation/content_translation.module
index 36557cd..b7cfefb 100644
--- a/core/modules/content_translation/content_translation.module
+++ b/core/modules/content_translation/content_translation.module
@@ -460,6 +460,21 @@ function content_translation_language_configuration_element_process(array $eleme
     $key = $element['#name'];
     $form_state->set(['content_translation', 'key'], $key);
     $context = $form_state->get(['language', $key]);
+    $element['#attached']['library'][] = 'content_translation/drupal.content_translation.admin';
+    if (isset($element['langcode'])) {
+      // Add CSS classes for easier JS selection.
+      $element['language_show'] = array_merge_recursive($element['language_show'], array('#attributes' => array(
+        'class' => array('language-show-checkbox')
+      )));
+    }
+    if (isset($element['langcode'])) {
+      // Make the description only visible if the bundle is translatable and the
+      // language selector is shown.
+      $element['langcode']['#description'] .= '<span class="hidden-languages"> ' . t('Locked languages are hidden if the language selector is not shown and translation is enabled.') . '</span>';
+      $element['langcode'] = array_merge_recursive($element['langcode'], array('#attributes' => array(
+        'class' => array('langcode-select')
+      )));
+    }
 
     $element['content_translation'] = array(
       '#type' => 'checkbox',
@@ -468,6 +483,8 @@ function content_translation_language_configuration_element_process(array $eleme
       // default to no translatability.
       '#default_value' => $context['bundle'] ? \Drupal::service('content_translation.manager')->isEnabled($context['entity_type'], $context['bundle']) : FALSE,
       '#element_validate' => array('content_translation_language_configuration_element_validate'),
+      '#prefix' => '<label>' . t('Translation') . '</label>',
+      '#attributes' => array('class' => array('translation-enabled-checkbox')),
     );
 
     $submit_name = isset($form['actions']['save_continue']) ? 'save_continue' : 'submit';
diff --git a/core/modules/content_translation/css/content_translation.admin.css b/core/modules/content_translation/css/content_translation.admin.css
index 45fb024..007d346 100644
--- a/core/modules/content_translation/css/content_translation.admin.css
+++ b/core/modules/content_translation/css/content_translation.admin.css
@@ -31,3 +31,6 @@
 .language-content-settings-form .operations {
   width: 75%;
 }
+.form-item-default-language-language-show .description {
+  opacity: 0;
+}