diff --git a/core/modules/content_translation/src/ContentTranslationHandler.php b/core/modules/content_translation/src/ContentTranslationHandler.php
index 6fd2254..79c573c 100644
--- a/core/modules/content_translation/src/ContentTranslationHandler.php
+++ b/core/modules/content_translation/src/ContentTranslationHandler.php
@@ -4,6 +4,7 @@
 
 use Drupal\Core\Access\AccessResult;
 use Drupal\Core\DependencyInjection\DependencySerializationTrait;
+use Drupal\Core\Entity\ContentEntityInterface;
 use Drupal\Core\Entity\EntityHandlerInterface;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityManagerInterface;
@@ -264,28 +265,28 @@ public function getSourceLangcode(FormStateInterface $form_state) {
    * {@inheritdoc}
    */
   public function entityFormAlter(array &$form, FormStateInterface $form_state, EntityInterface $entity) {
-    $form_object = $form_state->getFormObject();
-    $form_langcode = $form_object->getFormLangcode($form_state);
-    $entity_langcode = $entity->getUntranslated()->language()->getId();
+    /** @var ContentEntityInterface $entity */
+    $entity_langcode = $entity->language()->getId();
+    $default_langcode = $entity->getUntranslated()->language()->getId();
     $source_langcode = $this->getSourceLangcode($form_state);
 
     $new_translation = !empty($source_langcode);
     $translations = $entity->getTranslationLanguages();
     if ($new_translation) {
       // Make sure a new translation does not appear as existing yet.
-      unset($translations[$form_langcode]);
+      unset($translations[$entity_langcode]);
     }
-    $is_translation = !$form_object->isDefaultFormLangcode($form_state);
+    $is_translation = $entity_langcode != $default_langcode;
     $has_translations = count($translations) > 1;
 
     // Adjust page title to specify the current language being edited, if we
     // have at least one translation.
     $languages = $this->languageManager->getLanguages();
-    if (isset($languages[$form_langcode]) && ($has_translations || $new_translation)) {
+    if (isset($languages[$entity_langcode]) && ($has_translations || $new_translation)) {
       $title = $this->entityFormTitle($entity);
       // When editing the original values display just the entity label.
-      if ($form_langcode != $entity_langcode) {
-        $t_args = array('%language' => $languages[$form_langcode]->getName(), '%title' => $entity->label(), '@title' => $title);
+      if ($is_translation) {
+        $t_args = array('%language' => $languages[$entity_langcode]->getName(), '%title' => $entity->label(), '@title' => $title);
         $title = empty($source_langcode) ? t('@title [%language translation]', $t_args) : t('Create %language translation of %title', $t_args);
       }
       $form['#title'] = $title;
@@ -337,7 +338,7 @@ public function entityFormAlter(array &$form, FormStateInterface $form_state, En
         foreach ($this->languageManager->getLanguages() as $language) {
           // Show the current language, and the languages for which no
           // translation already exists.
-          if (empty($translations[$language->getId()]) || $language->getId() == $entity_langcode) {
+          if (empty($translations[$language->getId()]) || $language->getId() == $default_langcode) {
             $options[$language->getId()] = $language->getName();
           }
         }