diff -u b/core/modules/system/lib/Drupal/system/Entity/Menu.php b/core/modules/system/lib/Drupal/system/Entity/Menu.php
--- b/core/modules/system/lib/Drupal/system/Entity/Menu.php
+++ b/core/modules/system/lib/Drupal/system/Entity/Menu.php
@@ -96,7 +96,7 @@
   public function getOperationLinks() {
     $links = parent::getOperationLinks();
     if (\Drupal::currentUser()->hasPermission('administer menu')) {
-      $links['menu-edit']['href'] = 'admin/structure/menu/manage/' . $this->id() . '/edit';
+      $links['menu-edit']['href'] = 'admin/structure/menu/manage/' . $this->id();
       $links['menu-edit']['title'] = t('Edit menu');
     }
     return $links;
diff -u b/core/modules/system/lib/Drupal/system/Plugin/Block/SystemMenuBlock.php b/core/modules/system/lib/Drupal/system/Plugin/Block/SystemMenuBlock.php
--- b/core/modules/system/lib/Drupal/system/Plugin/Block/SystemMenuBlock.php
+++ b/core/modules/system/lib/Drupal/system/Plugin/Block/SystemMenuBlock.php
@@ -54,7 +54,7 @@
 
     $links = array();
     if (user_access('administer menu')) {
-      $links['menu-edit']['href'] = 'admin/structure/menu/manage/' . $menu . '/edit';
+      $links['menu-edit']['href'] = 'admin/structure/menu/manage/' . $menu;
       $links['menu-edit']['title'] = t('Edit menu');
     }
     return $links;