diff --git a/core/modules/node/src/Controller/NodeController.php b/core/modules/node/src/Controller/NodeController.php
index f4a30ee..151acd9 100644
--- a/core/modules/node/src/Controller/NodeController.php
+++ b/core/modules/node/src/Controller/NodeController.php
@@ -196,8 +196,9 @@ public function revisionOverview(NodeInterface $node) {
             . (($revision->revision_log->value != '') ? '<p class="revision-log">' . Xss::filter($revision->revision_log->value) . '</p>' : '');
 
           if ($revert_permission) {
+            $button_text = $node->getRevisionId() < $vid ? $this->t('Set current') : $this->t('Revert');
             $links['revert'] = array(
-              'title' => $this->t('Revert'),
+              'title' => $button_text,
               'url' => Url::fromRoute('node.revision_revert_confirm', ['node' => $node->id(), 'node_revision' => $vid]),
             );
           }
diff --git a/core/modules/node/src/Form/NodeRevisionRevertForm.php b/core/modules/node/src/Form/NodeRevisionRevertForm.php
index d6e748e..e69b90f 100644
--- a/core/modules/node/src/Form/NodeRevisionRevertForm.php
+++ b/core/modules/node/src/Form/NodeRevisionRevertForm.php
@@ -11,6 +11,7 @@
 use Drupal\Core\Form\ConfirmFormBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Url;
+use Drupal\node\Entity\Node;
 use Drupal\node\NodeInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
@@ -63,7 +64,13 @@ public function getFormId() {
    * {@inheritdoc}
    */
   public function getQuestion() {
-    return t('Are you sure you want to revert to the revision from %revision-date?', array('%revision-date' => format_date($this->revision->getRevisionCreationTime())));
+    // If the version is newer than the current version, change to 'set current'.
+    $args = array('%revision-date' => format_date($this->revision->getRevisionCreationTime()));
+    if ($this->versionIsNewer()) {
+      return $this->t('Are you sure you want to set the current version to %revision-date?', $args);
+    }
+
+    return $this->t('Are you sure you want to revert to the revision from %revision-date?', $args);
   }
 
   /**
@@ -77,7 +84,7 @@ public function getCancelUrl() {
    * {@inheritdoc}
    */
   public function getConfirmText() {
-    return t('Revert');
+    return $this->versionIsNewer() ? $this->t('Set current version') : $this->t('Revert');
   }
 
   /**
@@ -121,4 +128,11 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
     );
   }
 
+  /**
+   * Helper function to determine if this version is newer than current.
+   */
+  protected function versionIsNewer() {
+    $node = Node::load($this->revision->id());
+    return $this->revision->getRevisionId() > $node->getRevisionId();
+  }
 }