diff --git a/app/assets/javascripts/discourse/app/templates/components/bread-crumbs.hbs b/app/assets/javascripts/discourse/app/templates/components/bread-crumbs.hbs
index cac57057ffe..d8c1ab13633 100644
--- a/app/assets/javascripts/discourse/app/templates/components/bread-crumbs.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/bread-crumbs.hbs
@@ -3,6 +3,7 @@
     {{category-drop
       category=breadcrumb.category
       categories=breadcrumb.options
+      tagId=tagId
       options=(hash
         parentCategory=breadcrumb.parentCategory
         subCategory=breadcrumb.isSubcategory
diff --git a/app/assets/javascripts/select-kit/addon/components/category-drop.js b/app/assets/javascripts/select-kit/addon/components/category-drop.js
index 762d06b2aeb..a7d6e82e060 100644
--- a/app/assets/javascripts/select-kit/addon/components/category-drop.js
+++ b/app/assets/javascripts/select-kit/addon/components/category-drop.js
@@ -161,7 +161,14 @@ export default ComboBoxComponent.extend({
     onChange(categoryId) {
       let categoryURL;
 
-      if (categoryId === ALL_CATEGORIES_ID) {
+      if (this.tagId && !this.category) {
+        const category = Category.findById(parseInt(categoryId, 10));
+        categoryURL = getURL(
+          `/tags/c/${Category.slugFor(category)}/${
+            category.id
+          }/${this.tagId.toLowerCase()}`
+        );
+      } else if (categoryId === ALL_CATEGORIES_ID) {
         categoryURL = this.allCategoriesUrl;
       } else if (categoryId === NO_CATEGORIES_ID) {
         categoryURL = this.noCategoriesUrl;