diff --git a/core/modules/translation_entity/css/translation_entity.admin.css b/core/modules/translation_entity/css/translation_entity.admin.css
index cab64f8..ee75125 100644
--- a/core/modules/translation_entity/css/translation_entity.admin.css
+++ b/core/modules/translation_entity/css/translation_entity.admin.css
@@ -33,3 +33,7 @@
 #language-content-settings-form table .operations {
   width: 75%;
 }
+
+.form-item-default-language-language-show .description {
+  opacity: 0;
+}
diff --git a/core/modules/translation_entity/translation_entity.admin.inc b/core/modules/translation_entity/translation_entity.admin.inc
index dd7874c..d594371 100644
--- a/core/modules/translation_entity/translation_entity.admin.inc
+++ b/core/modules/translation_entity/translation_entity.admin.inc
@@ -151,6 +151,16 @@ function _translation_entity_preprocess_language_content_settings_table(&$variab
       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(
@@ -161,6 +171,7 @@ function _translation_entity_preprocess_language_content_settings_table(&$variab
 
     foreach ($field_names as $field_name) {
       $field_element = &$element[$bundle]['fields'][$field_name];
+
       $rows[] = array(
         'data' => array(
           array(
diff --git a/core/modules/translation_entity/translation_entity.admin.js b/core/modules/translation_entity/translation_entity.admin.js
index 2b934e8..ec8c42d 100644
--- a/core/modules/translation_entity/translation_entity.admin.js
+++ b/core/modules/translation_entity/translation_entity.admin.js
@@ -103,4 +103,77 @@ Drupal.behaviors.translationEntity = {
   }
 };
 
+/**
+ * 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) {
+    var $context = $(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);
diff --git a/core/modules/translation_entity/translation_entity.module b/core/modules/translation_entity/translation_entity.module
index bbe6605..2f232bc 100644
--- a/core/modules/translation_entity/translation_entity.module
+++ b/core/modules/translation_entity/translation_entity.module
@@ -920,6 +920,22 @@ function translation_entity_language_configuration_element_process(array $elemen
   if (empty($element['#translation_entity_skip_alter']) && user_access('administer entity translation')) {
     $form_state['translation_entity']['key'] = $element['#name'];
     $context = $form_state['language'][$element['#name']];
+    $element['#attached']['library'][] = array('translation_entity', 'drupal.translation_entity.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['translation_entity'] = array(
       '#type' => 'checkbox',
@@ -927,6 +943,7 @@ function translation_entity_language_configuration_element_process(array $elemen
       '#default_value' => translation_entity_enabled($context['entity_type'], $context['bundle']),
       '#element_validate' => array('translation_entity_language_configuration_element_validate'),
       '#prefix' => '<label>' . t('Translation') . '</label>',
+      '#attributes' => array('class' => array('translation-enabled-checkbox')),
     );
 
     $form['#submit'][] = 'translation_entity_language_configuration_element_submit';