diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module
index 837609e6ec67c02e1a222a7aa4285847d1c99384..0cbe24c63ee8795db2e43f4ad05f1a8b63a0c4dc 100644
--- a/core/modules/comment/comment.module
+++ b/core/modules/comment/comment.module
@@ -203,12 +203,18 @@ function comment_menu() {
  * Implements hook_menu_link_defaults().
  */
 function comment_menu_link_defaults() {
-  $links['comment.admin.content'] = array(
-    'link_title' => 'Comment forms',
+  $links['comment.admin.content.comment'] = array(
+    'link_title' => 'Comments',
     'route_name' => 'comment.admin',
-    'parent' => 'system.admin.structure',
+    'parent' => \Drupal::moduleHandler()->moduleExists('node') ? 'node.admin.content' : 'system.admin',
     'description' => 'List and edit site comments and the comment approval queue.',
   );
+  $links['comment.admin.structure.comments'] = array(
+    'link_title' => 'Comment forms',
+    'route_name' => 'comment.bundle_list',
+    'parent' => 'system.admin.structure',
+    'description' => 'Manage fields and displays settings for comment forms.',
+  );
 
   return $links;
 }