diff --git a/core/modules/menu_ui/menu_ui.module b/core/modules/menu_ui/menu_ui.module
index 8dbb4e2..569df61 100644
--- a/core/modules/menu_ui/menu_ui.module
+++ b/core/modules/menu_ui/menu_ui.module
@@ -76,6 +76,9 @@ function menu_ui_entity_type_build(array &$entity_types) {
     ->setLinkTemplate('add-form', 'menu_ui.menu_add')
     ->setLinkTemplate('delete-form', 'menu_ui.delete_menu')
     ->setLinkTemplate('edit-form', 'menu_ui.menu_edit');
+  if (isset($entity_types['menu_link_content'])) {
+    $entity_types['menu']->setLinkTemplate('add-link-form', 'menu_link_content.link_add');
+  }
 }
 
 
diff --git a/core/modules/menu_ui/src/MenuListBuilder.php b/core/modules/menu_ui/src/MenuListBuilder.php
index 0c6615d..a4d900f 100644
--- a/core/modules/menu_ui/src/MenuListBuilder.php
+++ b/core/modules/menu_ui/src/MenuListBuilder.php
@@ -51,10 +51,12 @@ public function getDefaultOperations(EntityInterface $entity) {
 
     if (isset($operations['edit'])) {
       $operations['edit']['title'] = t('Edit menu');
-      $operations['add'] = array(
-        'title' => t('Add link'),
-        'weight' => 20,
-      ) + $entity->urlInfo('add-form')->toArray();
+      if ($this->moduleHandler()->moduleExists('menu_link_content')) {
+        $operations['add'] = array(
+          'title' => t('Add link'),
+          'weight' => 20,
+        ) + $entity->urlInfo('add-link-form')->toArray();
+      }
     }
     if (isset($operations['delete'])) {
       $operations['delete']['title'] = t('Delete menu');
diff --git a/core/modules/menu_ui/src/Tests/MenuTest.php b/core/modules/menu_ui/src/Tests/MenuTest.php
index ce7fd57..8a10db7 100644
--- a/core/modules/menu_ui/src/Tests/MenuTest.php
+++ b/core/modules/menu_ui/src/Tests/MenuTest.php
@@ -249,6 +249,10 @@ function doMenuTests() {
       ),
     ));
 
+    // Verify add link button.
+    $this->drupalGet('admin/structure/menu');
+    $this->assertLinkByHref('admin/structure/menu/manage/' . $menu_name . '/add', "The add menu link button url is correct");
+
     // Add menu links.
     $item1 = $this->addMenuLink('', 'node/' . $node1->id(), $menu_name, TRUE);
     $item2 = $this->addMenuLink($item1->getPluginId(), 'node/' . $node2->id(), $menu_name, FALSE);