diff --git a/core/modules/help/help.links.task.yml b/core/modules/help/help.links.task.yml
index e2ce418..3ce34f1 100644
--- a/core/modules/help/help.links.task.yml
+++ b/core/modules/help/help.links.task.yml
@@ -1,9 +1,9 @@
 entity.help_topic.canonical:
   title: 'View'
   route_name: entity.help_topic.canonical
-  base_route: entity.help_topic.canonical
+  base_route: entity.help_topic.edit_form
 
 entity.help_topic.edit_form:
   title: 'Edit'
   route_name: entity.help_topic.edit_form
-  base_route: entity.help_topic.canonical
+  base_route: entity.help_topic.edit_form
diff --git a/core/modules/help/help.routing.yml b/core/modules/help/help.routing.yml
index b99124b..22079ae 100644
--- a/core/modules/help/help.routing.yml
+++ b/core/modules/help/help.routing.yml
@@ -45,7 +45,7 @@ entity.help_topic.add_form:
      _entity_create_access: 'help_topic'
 
 entity.help_topic.edit_form:
-   path: '/admin/config/development/help/{help_topic}/edit'
+   path: '/admin/config/development/help/{help_topic}'
    defaults:
      _entity_form: 'help_topic.edit'
      _title: 'Edit help topic'
diff --git a/core/modules/help/src/Tests/HelpTopicTranslateTest.php b/core/modules/help/src/Tests/HelpTopicTranslateTest.php
index 74205f0..ca59c2c 100644
--- a/core/modules/help/src/Tests/HelpTopicTranslateTest.php
+++ b/core/modules/help/src/Tests/HelpTopicTranslateTest.php
@@ -51,7 +51,7 @@ public function testHelpTranslation() {
     // Translate a topic.
     $es_body = 'This is the fake Spanish body';
     $es_title = 'This is the fake Spanish title';
-    $this->drupalGet('admin/config/development/help/help_test/edit/translate');
+    $this->drupalGet('admin/config/development/help/help_test/translate');
     $this->clickLink(t('Add'));
     $this->drupalPostForm(NULL, array(
       'config_names[help.topic.help_test][label][translation]' => $es_title,