diff --git a/core/modules/menu_link_content/src/Form/MenuLinkContentDeleteForm.php b/core/modules/menu_link_content/src/Form/MenuLinkContentDeleteForm.php
index e75d075..ba8eb76 100644
--- a/core/modules/menu_link_content/src/Form/MenuLinkContentDeleteForm.php
+++ b/core/modules/menu_link_content/src/Form/MenuLinkContentDeleteForm.php
@@ -19,7 +19,10 @@ class MenuLinkContentDeleteForm extends ContentEntityDeleteForm {
    * {@inheritdoc}
    */
   public function getCancelUrl() {
-    return new Url('entity.menu.edit_form', array('menu' => $this->entity->getMenuName()));
+    if ($this->moduleHandler->moduleExists('menu_ui')) {
+      return new Url('entity.menu.edit_form', array('menu' => $this->entity->getMenuName()));
+    }
+    return $this->entity->urlInfo();
   }
 
   /**
diff --git a/core/modules/menu_link_content/src/Tests/MenuLinkContentDeleteFormTest.php b/core/modules/menu_link_content/src/Tests/MenuLinkContentDeleteFormTest.php
new file mode 100644
index 0000000..c411f83
--- /dev/null
+++ b/core/modules/menu_link_content/src/Tests/MenuLinkContentDeleteFormTest.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * @file
+ * Contains \Drupal\menu_link_content\Tests\MenuLinkContentDeleteFormTest.
+ */
+
+namespace Drupal\menu_link_content\Tests;
+
+use Drupal\menu_link_content\Entity\MenuLinkContent;
+use Drupal\simpletest\WebTestBase;
+use Drupal\system\Entity\Menu;
+
+/**
+ * Tests the menu link content delete UI.
+ *
+ * @group Menu
+ */
+class MenuLinkContentDeleteFormTest extends WebTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['menu_link_content'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $web_user = $this->drupalCreateUser(['administer menu']);
+    $this->drupalLogin($web_user);
+  }
+
+  /**
+   * Tests the MenuLinkContentDeleteForm class.
+   */
+  public function testMenuLinkContentDeleteForm() {
+    // Add new menu item.
+    $this->drupalPostForm(
+      'admin/structure/menu/manage/admin/add',
+      [
+        'title[0][value]' => t('Front page'),
+        'link[0][uri]' => '<front>',
+      ],
+      t('Save')
+    );
+    $this->assertText(t('The menu link has been saved.'));
+
+    $menu_link = MenuLinkContent::load(1);
+    $this->drupalGet($menu_link->urlInfo('delete-form'));
+    $this->assertRaw(t('Are you sure you want to delete the custom menu link %name?', ['%name' => $menu_link->label()]));
+    $this->assertLink(t('Cancel'));
+    // Make sure cancel link points to link edit
+    $this->assertLinkByHref($menu_link->url('edit-form'));
+
+    \Drupal::service('module_installer')->install(['menu_ui']);
+    // Make sure cancel URL points to menu_ui route now.
+    $this->drupalGet($menu_link->urlInfo('delete-form'));
+    $menu = Menu::load($menu_link->getMenuName());
+    $this->assertLinkByHref($menu->url('edit-form'));
+    $this->drupalPostForm(NULL, [], t('Delete'));
+    $this->assertRaw(t('The menu link %title has been deleted.', ['%title' => $menu_link->label()]));
+  }
+
+}
diff --git a/core/modules/menu_link_content/src/Tests/MenuLinkContentFormTest.php b/core/modules/menu_link_content/src/Tests/MenuLinkContentFormTest.php
index 1c9d10e..9395d66 100644
--- a/core/modules/menu_link_content/src/Tests/MenuLinkContentFormTest.php
+++ b/core/modules/menu_link_content/src/Tests/MenuLinkContentFormTest.php
@@ -22,7 +22,6 @@ class MenuLinkContentFormTest extends WebTestBase {
    */
   public static $modules = array(
     'menu_link_content',
-    'menu_ui',
   );
 
   /**
diff --git a/core/modules/menu_ui/menu_ui.permissions.yml b/core/modules/menu_ui/menu_ui.permissions.yml
deleted file mode 100644
index 9bc104f..0000000
--- a/core/modules/menu_ui/menu_ui.permissions.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-administer menu:
-  title: 'Administer menus and menu items'
diff --git a/core/modules/system/system.permissions.yml b/core/modules/system/system.permissions.yml
index 44bb5ef..726c295 100644
--- a/core/modules/system/system.permissions.yml
+++ b/core/modules/system/system.permissions.yml
@@ -22,3 +22,5 @@ link to any page:
   title: 'Link to any page'
   restrict access: true
   description: 'This allows to bypass access checking when linking to internal paths.'
+administer menu:
+  title: 'Administer menus and menu items'