diff --git a/app/assets/javascripts/discourse/app/components/sidebar/categories-form-modal.hbs b/app/assets/javascripts/discourse/app/components/sidebar/categories-form-modal.hbs
index 988eab9b7e1..a7693476b98 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/categories-form-modal.hbs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/categories-form-modal.hbs
@@ -84,7 +84,7 @@
   <div class="modal-footer sidebar-categories-form__modal-footer">
     <DButton
       @class="btn-primary sidebar-categories-form__save-button"
-      @label="sidebar.categories_form_modal.save"
+      @label="save"
       @disabled={{this.saving}}
       @action={{this.save}}
     />
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/tags-form-modal.hbs b/app/assets/javascripts/discourse/app/components/sidebar/tags-form-modal.hbs
new file mode 100644
index 00000000000..2b0400252cd
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/sidebar/tags-form-modal.hbs
@@ -0,0 +1,42 @@
+<DModalBody
+  @title="sidebar.tags_form_modal.title"
+  @class="sidebar-tags-form-modal"
+>
+  <form class="sidebar-tags-form">
+    {{#each this.tags as |tag|}}
+      <div class="sidebar-tags-form__tag" data-tag-name={{tag.name}}>
+        <Input
+          id={{concat "sidebar-tags-form__input--" tag.name}}
+          class="sidebar-tags-form__input"
+          @type="checkbox"
+          @checked={{includes this.selectedTags tag.name}}
+          {{on "click" (action "toggleTag" tag.name)}}
+        />
+
+        <label
+          class="sidebar-tags-form__tag-label"
+          for={{concat "sidebar-tags-form__input--" tag.name}}
+        >
+          <p>
+            <span class="sidebar-tags-form__tag-label-name">
+              {{tag.name}}
+            </span>
+
+            <span class="sidebar-tags-form__tag-label-count">
+              ({{tag.count}})
+            </span>
+          </p>
+        </label>
+      </div>
+    {{/each}}
+  </form>
+</DModalBody>
+
+<div class="modal-footer">
+  <DButton
+    @class="btn-primary sidebar-tags-form__save-button"
+    @label="save"
+    @disabled={{this.saving}}
+    @action={{this.save}}
+  />
+</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/tags-form-modal.js b/app/assets/javascripts/discourse/app/components/sidebar/tags-form-modal.js
new file mode 100644
index 00000000000..5f087845f3a
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/sidebar/tags-form-modal.js
@@ -0,0 +1,63 @@
+import Component from "@glimmer/component";
+import { tracked } from "@glimmer/tracking";
+import { inject as service } from "@ember/service";
+import { action } from "@ember/object";
+
+import { popupAjaxError } from "discourse/lib/ajax-error";
+
+export default class extends Component {
+  @service currentUser;
+  @service store;
+  @tracked tags = [];
+  @tracked selectedTags = [...this.currentUser.sidebarTagNames];
+
+  constructor() {
+    super(...arguments);
+    this.#loadTags();
+  }
+
+  async #loadTags() {
+    // This is loading all tags upfront and there is no pagination for it. However, this is what we are doing for the
+    // `/tags` route as well so we have decided to kick this can of worms down the road for now.
+    await this.store
+      .findAll("tag")
+      .then((tags) => {
+        this.tags = tags.content.sort((a, b) => {
+          return a.name.localeCompare(b.name);
+        });
+      })
+      .catch((error) => {
+        popupAjaxError(error);
+      });
+  }
+
+  @action
+  toggleTag(tag) {
+    if (this.selectedTags.includes(tag)) {
+      this.selectedTags.removeObject(tag);
+    } else {
+      this.selectedTags.addObject(tag);
+    }
+  }
+
+  @action
+  save() {
+    this.saving = true;
+    const initialSidebarTags = this.currentUser.sidebar_tags;
+    this.currentUser.set("sidebar_tag_names", this.selectedTags);
+
+    this.currentUser
+      .save(["sidebar_tag_names"])
+      .then((result) => {
+        this.currentUser.set("sidebar_tags", result.user.sidebar_tags);
+        this.args.closeModal();
+      })
+      .catch((error) => {
+        this.currentUser.set("sidebar_tags", initialSidebarTags);
+        popupAjaxError(error);
+      })
+      .finally(() => {
+        this.saving = false;
+      });
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/user/tags-section.js b/app/assets/javascripts/discourse/app/components/sidebar/user/tags-section.js
index 381c1160b97..5c3fa3dde08 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/user/tags-section.js
+++ b/app/assets/javascripts/discourse/app/components/sidebar/user/tags-section.js
@@ -6,6 +6,7 @@ import SidebarCommonTagsSection from "discourse/components/sidebar/common/tags-s
 import TagSectionLink from "discourse/lib/sidebar/user/tags-section/tag-section-link";
 import PMTagSectionLink from "discourse/lib/sidebar/user/tags-section/pm-tag-section-link";
 import { hasDefaultSidebarTags } from "discourse/lib/sidebar/helpers";
+import showModal from "discourse/lib/show-modal";
 
 export default class SidebarUserTagsSection extends SidebarCommonTagsSection {
   @service router;
@@ -79,6 +80,12 @@ export default class SidebarUserTagsSection extends SidebarCommonTagsSection {
 
   @action
   editTracked() {
-    this.router.transitionTo("preferences.navigation-menu", this.currentUser);
+    if (
+      this.currentUser.new_edit_sidebar_categories_tags_interface_groups_enabled
+    ) {
+      showModal("sidebar-tags-form");
+    } else {
+      this.router.transitionTo("preferences.navigation-menu", this.currentUser);
+    }
   }
 }
diff --git a/app/assets/javascripts/discourse/app/controllers/sidebar-tags-form.js b/app/assets/javascripts/discourse/app/controllers/sidebar-tags-form.js
new file mode 100644
index 00000000000..eca315bcbe8
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/controllers/sidebar-tags-form.js
@@ -0,0 +1,6 @@
+import Controller from "@ember/controller";
+import ModalFunctionality from "discourse/mixins/modal-functionality";
+
+export default class SidebarTagsForm extends Controller.extend(
+  ModalFunctionality
+) {}
diff --git a/app/assets/javascripts/discourse/app/templates/modal/sidebar-tags-form.hbs b/app/assets/javascripts/discourse/app/templates/modal/sidebar-tags-form.hbs
new file mode 100644
index 00000000000..a93d9d2a63d
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/templates/modal/sidebar-tags-form.hbs
@@ -0,0 +1 @@
+<Sidebar::TagsFormModal @closeModal={{(action "closeModal")}} />
\ No newline at end of file
diff --git a/app/assets/stylesheets/common/base/modal.scss b/app/assets/stylesheets/common/base/modal.scss
index b9fe680a575..f249a9b4818 100644
--- a/app/assets/stylesheets/common/base/modal.scss
+++ b/app/assets/stylesheets/common/base/modal.scss
@@ -134,7 +134,7 @@
   }
 
   &:not(.history-modal) {
-    .modal-body:not(.reorder-categories):not(.poll-ui-builder):not(.poll-breakdown):not(.sidebar-categories-form__modal-body) {
+    .modal-body:not(.reorder-categories):not(.poll-ui-builder):not(.poll-breakdown):not(.sidebar-categories-form-modal):not(.sidebar-tags-form-modal) {
       max-height: 80vh !important;
       @media screen and (max-height: 500px) {
         max-height: 65vh !important;
diff --git a/app/assets/stylesheets/common/components/_index.scss b/app/assets/stylesheets/common/components/_index.scss
index 1daeeb9fc7e..0e2b7ddadc6 100644
--- a/app/assets/stylesheets/common/components/_index.scss
+++ b/app/assets/stylesheets/common/components/_index.scss
@@ -29,6 +29,7 @@
 @import "share-and-invite-modal";
 @import "download-calendar";
 @import "sidebar-categories-form";
+@import "sidebar-tags-form";
 @import "svg";
 @import "tap-tile";
 @import "time-input";
diff --git a/app/assets/stylesheets/common/components/sidebar-tags-form.scss b/app/assets/stylesheets/common/components/sidebar-tags-form.scss
new file mode 100644
index 00000000000..f2920a92431
--- /dev/null
+++ b/app/assets/stylesheets/common/components/sidebar-tags-form.scss
@@ -0,0 +1,34 @@
+.sidebar-tags-form-modal {
+  .modal-body {
+    min-height: 30vh;
+  }
+}
+
+.sidebar-tags-form {
+  display: flex;
+  flex-wrap: wrap;
+
+  .sidebar-tags-form__tag {
+    flex-basis: 30%;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    padding: 0.5em 0.25em;
+
+    .sidebar-tags-form__tag-label {
+      margin-bottom: 0;
+
+      p {
+        margin: 0;
+      }
+    }
+
+    .sidebar-tags-form__input {
+      margin-top: 0;
+    }
+  }
+
+  .sidebar-tags-form__tag-label-count {
+    color: var(--primary-medium);
+  }
+}
diff --git a/app/assets/stylesheets/desktop/components/_index.scss b/app/assets/stylesheets/desktop/components/_index.scss
index 02189ecc35e..9c3a0e1415e 100644
--- a/app/assets/stylesheets/desktop/components/_index.scss
+++ b/app/assets/stylesheets/desktop/components/_index.scss
@@ -1,4 +1,5 @@
 @import "sidebar-categories-form";
+@import "sidebar-tags-form";
 @import "user-card";
 @import "user-info";
 @import "user-stream-item";
diff --git a/app/assets/stylesheets/desktop/components/sidebar-tags-form.scss b/app/assets/stylesheets/desktop/components/sidebar-tags-form.scss
new file mode 100644
index 00000000000..450b2443d63
--- /dev/null
+++ b/app/assets/stylesheets/desktop/components/sidebar-tags-form.scss
@@ -0,0 +1,5 @@
+.sidebar-tags-form-modal {
+  .modal-inner-container {
+    min-width: var(--modal-max-width);
+  }
+}
diff --git a/app/assets/stylesheets/mobile/components/_index.scss b/app/assets/stylesheets/mobile/components/_index.scss
index 1df01e0a16b..af37ea99529 100644
--- a/app/assets/stylesheets/mobile/components/_index.scss
+++ b/app/assets/stylesheets/mobile/components/_index.scss
@@ -1,4 +1,5 @@
 @import "sidebar-categories-form";
+@import "sidebar-tags-form";
 @import "topic-footer-mobile-dropdown";
 @import "user-card";
 @import "user-stream-item";
diff --git a/app/assets/stylesheets/mobile/components/sidebar-tags-form.scss b/app/assets/stylesheets/mobile/components/sidebar-tags-form.scss
new file mode 100644
index 00000000000..d20e9bfe914
--- /dev/null
+++ b/app/assets/stylesheets/mobile/components/sidebar-tags-form.scss
@@ -0,0 +1,5 @@
+.sidebar-tags-form {
+  .sidebar-tags-form__tag {
+    flex-basis: 100%;
+  }
+}
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index cf9fc670d75..9affca2668d 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -4390,7 +4390,6 @@ en:
       all_categories: "All categories"
       all_tags: "All tags"
       categories_form_modal:
-        save: "Save"
         title: "Edit categories navigation"
         subtitle:
           button_text: "Deselect all"
@@ -4398,6 +4397,8 @@ en:
         filter_placeholder: "Filter categories"
         no_categories: "There are no categories matching the given term."
         reset_to_defaults: "Reset to defaults"
+      tags_form_modal:
+        title: "Edit tags navigation"
 
       sections:
         custom:
diff --git a/spec/system/editing_sidebar_tags_navigation_spec.rb b/spec/system/editing_sidebar_tags_navigation_spec.rb
new file mode 100644
index 00000000000..ccc281cb165
--- /dev/null
+++ b/spec/system/editing_sidebar_tags_navigation_spec.rb
@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+RSpec.describe "Editing sidebar tags navigation", type: :system do
+  fab!(:user) { Fabricate(:user) }
+  fab!(:group) { Fabricate(:group).tap { |g| g.add(user) } }
+  fab!(:tag) { Fabricate(:tag, name: "tag", public_topic_count: 1, staff_topic_count: 1) }
+  fab!(:tag2) { Fabricate(:tag, name: "tag2", public_topic_count: 2, staff_topic_count: 2) }
+  fab!(:tag3) { Fabricate(:tag, name: "tag3", public_topic_count: 3, staff_topic_count: 3) }
+
+  let(:sidebar) { PageObjects::Components::Sidebar.new }
+
+  before do
+    SiteSetting.new_edit_sidebar_categories_tags_interface_groups = group.name
+    sign_in(user)
+  end
+
+  it "allows a user to edit the sidebar categories navigation" do
+    visit "/latest"
+
+    expect(sidebar).to have_tags_section
+    expect(sidebar).to have_no_section_link(tag.name)
+    expect(sidebar).to have_no_section_link(tag2.name)
+    expect(sidebar).to have_no_section_link(tag3.name)
+
+    modal = sidebar.click_edit_tags_button
+
+    expect(modal).to have_right_title(I18n.t("js.sidebar.tags_form_modal.title"))
+    expect(modal).to have_tag_checkboxes([tag, tag2, tag3])
+
+    modal.toggle_tag_checkbox(tag).toggle_tag_checkbox(tag2).save
+
+    expect(modal).to be_closed
+    expect(sidebar).to have_section_link(tag.name)
+    expect(sidebar).to have_section_link(tag2.name)
+    expect(sidebar).to have_no_section_link(tag3.name)
+
+    visit "/latest"
+
+    expect(sidebar).to have_section_link(tag.name)
+    expect(sidebar).to have_section_link(tag2.name)
+    expect(sidebar).to have_no_section_link(tag3.name)
+
+    modal = sidebar.click_edit_tags_button
+    modal.toggle_tag_checkbox(tag2).save
+
+    expect(modal).to be_closed
+
+    expect(sidebar).to have_section_link(tag.name)
+    expect(sidebar).to have_no_section_link(tag2.name)
+    expect(sidebar).to have_no_section_link(tag3.name)
+  end
+end
diff --git a/spec/system/page_objects/components/sidebar.rb b/spec/system/page_objects/components/sidebar.rb
index 31a73dcee4b..ac155f332e1 100644
--- a/spec/system/page_objects/components/sidebar.rb
+++ b/spec/system/page_objects/components/sidebar.rb
@@ -31,6 +31,14 @@ module PageObjects
         PageObjects::Modals::SidebarEditCategories.new
       end
 
+      def click_edit_tags_button
+        within(".sidebar-section[data-section-name='tags']") do
+          click_button(class: "sidebar-section-header-button", visible: false)
+        end
+
+        PageObjects::Modals::SidebarEditTags.new
+      end
+
       def edit_custom_section(name)
         find(".sidebar-section[data-section-name='#{name.parameterize}']").hover
 
@@ -71,6 +79,10 @@ module PageObjects
         has_section?("Categories")
       end
 
+      def has_tags_section?
+        has_section?("Tags")
+      end
+
       def has_no_section?(name)
         find(SIDEBAR_WRAPPER_SELECTOR).has_no_button?(name)
       end
diff --git a/spec/system/page_objects/modals/sidebar_edit_tags.rb b/spec/system/page_objects/modals/sidebar_edit_tags.rb
new file mode 100644
index 00000000000..2b3b0cdcba2
--- /dev/null
+++ b/spec/system/page_objects/modals/sidebar_edit_tags.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module PageObjects
+  module Modals
+    class SidebarEditTags < PageObjects::Modals::Base
+      def closed?
+        has_no_css?(".sidebar-tags-form-modal")
+      end
+
+      def has_right_title?(title)
+        has_css?(".sidebar-tags-form-modal #discourse-modal-title", text: title)
+      end
+
+      def has_tag_checkboxes?(tags)
+        tag_names = tags.map(&:name)
+
+        has_css?(".sidebar-tags-form-modal .sidebar-tags-form__tag", count: tag_names.length) &&
+          all(".sidebar-tags-form-modal .sidebar-tags-form__tag").all? do |row|
+            tag_names.include?(row["data-tag-name"].to_s)
+          end
+      end
+
+      def toggle_tag_checkbox(tag)
+        find(
+          ".sidebar-tags-form-modal .sidebar-tags-form__tag[data-tag-name='#{tag.name}'] .sidebar-tags-form__input",
+        ).click
+
+        self
+      end
+
+      def save
+        find(".sidebar-tags-form-modal .sidebar-tags-form__save-button").click
+        self
+      end
+    end
+  end
+end