diff --git a/core/modules/content_translation/content_translation.pages.inc b/core/modules/content_translation/content_translation.pages.inc
index d92cbc0..5f0a2e8 100644
--- a/core/modules/content_translation/content_translation.pages.inc
+++ b/core/modules/content_translation/content_translation.pages.inc
@@ -88,6 +88,7 @@ function content_translation_overview(EntityInterface $entity) {
         // language we point the link to the translation form.
         if ($edit_path && $entity->access('update')) {
           $links['edit'] = isset($edit_links->links[$langcode]['href']) ? $edit_links->links[$langcode] : array('href' => $edit_path, 'language' => $language);
+          $links['edit']['query']['content_translation_target'] = $langcode;
         }
         elseif (!$is_original && $controller->getTranslationAccess($entity, 'update')) {
           $links['edit'] = isset($translate_links->links[$langcode]['href']) ? $translate_links->links[$langcode] : array('href' => $translate_path, 'language' => $language);
@@ -95,7 +96,6 @@ function content_translation_overview(EntityInterface $entity) {
 
         if (isset($links['edit'])) {
           $links['edit']['title'] = t('Edit');
-          $links['edit']['query']['content_translation_target'] = $langcode;
         }
 
         $translation = $entity->translation[$langcode];
diff --git a/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationWorkflowsTest.php b/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationWorkflowsTest.php
index 4930283..879815a 100644
--- a/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationWorkflowsTest.php
+++ b/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationWorkflowsTest.php
@@ -123,7 +123,10 @@ protected function assertWorkflows(UserInterface $user, $expected_status) {
 
     // Check whether the user is allowed to access the entity form in edit mode.
     $edit_path = $this->controller->getEditPath($this->entity);
-    $options = array('language' => $languages[$default_langcode]);
+    $options = array(
+      'language' => $languages[$default_langcode],
+      'query' => array('content_translation_target' => $default_langcode),
+    );
     $this->drupalGet($edit_path, $options);
     $this->assertResponse($expected_status['edit'], format_string('The @user_label has the expected edit access.', $args));
 
@@ -161,7 +164,8 @@ protected function assertWorkflows(UserInterface $user, $expected_status) {
       if ($editor) {
         $this->clickLink('Edit', 2);
         // An editor should be pointed to the entity form in multilingual mode.
-        $this->assertUrl($edit_path, $options, 'The translation overview points to the edit form for editors when editing translations.');
+        $query = array('query' => array('content_translation_target' => $langcode));
+        $this->assertUrl($edit_path, $options + $query, 'The translation overview points to the edit form for editors when editing translations.');
       }
       else {
         $this->clickLink('Edit');