diff --git a/app/assets/javascripts/discourse/app/components/sidebar/user/categories-section.hbs b/app/assets/javascripts/discourse/app/components/sidebar/user/categories-section.hbs
index 4eb10dc30e6..0a70d6f079b 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/user/categories-section.hbs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/user/categories-section.hbs
@@ -27,4 +27,10 @@
       {{html-safe this.noCategoriesText}}
     </Sidebar::SectionMessage>
   {{/if}}
+  <Sidebar::SectionLink
+    @linkName="more-categories"
+    @content={{i18n "category.all"}}
+    @route="discovery.categories"
+    @class="sidebar-more-link"
+  />
 </Sidebar::Section>
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/user/tags-section.hbs b/app/assets/javascripts/discourse/app/components/sidebar/user/tags-section.hbs
index 3b318093b14..46903a6134d 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/user/tags-section.hbs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/user/tags-section.hbs
@@ -22,4 +22,10 @@
       {{html-safe this.noTagsText}}
     </Sidebar::SectionMessage>
   {{/if}}
+  <Sidebar::SectionLink
+    @linkName="more-tags"
+    @content={{i18n "tagging.all_tags"}}
+    @route="tags"
+    @class="sidebar-more-link"
+  />
 </Sidebar::Section>
diff --git a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-categories-section-test.js b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-categories-section-test.js
index 7425f7d5418..0651e8aaa55 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-categories-section-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-categories-section-test.js
@@ -42,7 +42,9 @@ acceptance(
       await visit("/");
 
       assert.strictEqual(
-        count(".sidebar-section-categories .sidebar-section-link"),
+        count(
+          ".sidebar-section-categories .sidebar-section-link:not(.sidebar-more-link)"
+        ),
         1,
         "there should only be one section link under the section"
       );
@@ -159,7 +161,7 @@ acceptance("Sidebar - Logged on user - Categories Section", function (needs) {
     await visit("/");
 
     const categorySectionLinks = queryAll(
-      ".sidebar-section-categories .sidebar-section-link"
+      ".sidebar-section-categories .sidebar-section-link:not(.sidebar-more-link)"
     );
 
     const categoryNames = [...categorySectionLinks].map((categorySectionLink) =>
@@ -179,7 +181,9 @@ acceptance("Sidebar - Logged on user - Categories Section", function (needs) {
     await visit("/");
 
     assert.strictEqual(
-      count(".sidebar-section-categories .sidebar-section-link"),
+      count(
+        ".sidebar-section-categories .sidebar-section-link:not(.sidebar-more-link)"
+      ),
       3,
       "there should only be 3 section link under the section"
     );
diff --git a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-tags-section-test.js b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-tags-section-test.js
index e2adb12ffbe..2214d9fcf9f 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-tags-section-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-tags-section-test.js
@@ -123,7 +123,7 @@ acceptance("Sidebar - Logged on user - Tags section", function (needs) {
     await visit("/");
 
     const tagSectionLinks = queryAll(
-      ".sidebar-section-tags .sidebar-section-link"
+      ".sidebar-section-tags .sidebar-section-link:not(.sidebar-more-link)"
     );
 
     const tagNames = [...tagSectionLinks].map((tagSectionLink) =>
@@ -141,7 +141,9 @@ acceptance("Sidebar - Logged on user - Tags section", function (needs) {
     await visit("/");
 
     assert.strictEqual(
-      count(".sidebar-section-tags .sidebar-section-link"),
+      count(
+        ".sidebar-section-tags .sidebar-section-link:not(.sidebar-more-link)"
+      ),
       4,
       "4 section links under the section"
     );
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index ea5fb2f12e8..35103561416 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -3886,7 +3886,7 @@ en:
       google: "Google Calendar"
       ics: "ICS"
     tagging:
-      all_tags: "All Tags"
+      all_tags: "All tags"
       other_tags: "Other Tags"
       selector_all_tags: "all tags"
       selector_no_tags: "no tags"