diff --git a/core/modules/node/lib/Drupal/node/NodeListController.php b/core/modules/node/lib/Drupal/node/NodeListController.php
index f34e57d..f5cd26b 100644
--- a/core/modules/node/lib/Drupal/node/NodeListController.php
+++ b/core/modules/node/lib/Drupal/node/NodeListController.php
@@ -101,11 +101,12 @@ public function buildRow(EntityInterface $entity) {
       '#mark_type' => node_mark($entity->id(), $entity->getChangedTime()),
     );
     $langcode = $entity->language()->id;
+    $uri = $entity->uri();
     $row['title']['data'] = array(
       '#type' => 'link',
       '#title' => $entity->label(),
-      '#href' => $entity->uri(),
-      '#options' => $langcode != Language::LANGCODE_NOT_SPECIFIED && isset($languages[$langcode]) ? array('language' => $languages[$langcode]) : array(),
+      '#href' => $uri['path'],
+      '#options' => $uri['options'] + ($langcode != Language::LANGCODE_NOT_SPECIFIED && isset($languages[$langcode]) ? array('language' => $languages[$langcode]) : array()),
       '#suffix' => ' ' . drupal_render($mark),
     );
     $row['type'] = String::checkPlain(node_get_type_label($entity));
@@ -128,9 +129,11 @@ public function buildRow(EntityInterface $entity) {
   public function getOperations(EntityInterface $entity) {
     $operations = parent::getOperations($entity);
     if ($entity->isTranslatable()) {
+      $uri = $entity->uri();
       $operations['translate'] = array(
         'title' => $this->t('Translate'),
-        'href' => $entity->uri() . '/translations',
+        'href' => $uri['path'] . '/translations',
+        'options' => $uri['options'],
       );
     }