diff --git a/app/assets/javascripts/discourse/app/components/reviewable-item.js b/app/assets/javascripts/discourse/app/components/reviewable-item.js
index 716f86095c2..70b5f9f3d0b 100644
--- a/app/assets/javascripts/discourse/app/components/reviewable-item.js
+++ b/app/assets/javascripts/discourse/app/components/reviewable-item.js
@@ -115,6 +115,11 @@ export default Component.extend({
     return _components[type];
   },
 
+  @discourseComputed("_updates.category_id", "reviewable.category.id")
+  tagCategoryId(updatedCategoryId, categoryId) {
+    return updatedCategoryId || categoryId;
+  },
+
   @bind
   _performConfirmed(action) {
     let reviewable = this.reviewable;
@@ -208,7 +213,7 @@ export default Component.extend({
 
     edit() {
       this.set("editing", true);
-      this._updates = { payload: {} };
+      this.set("_updates", { payload: {} });
     },
 
     cancelEdit() {
@@ -241,7 +246,7 @@ export default Component.extend({
         category = Category.findUncategorized();
       }
 
-      this._updates.category_id = category.id;
+      set(this._updates, "category_id", category.id);
     },
 
     valueChanged(fieldId, event) {
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-field-tags.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-field-tags.hbs
index 82f112d5c19..7d9ab0d12bb 100644
--- a/app/assets/javascripts/discourse/app/templates/components/reviewable-field-tags.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/reviewable-field-tags.hbs
@@ -1,4 +1,7 @@
 {{mini-tag-chooser
   value=value
   onChange=(action "onChange")
+  options=(hash
+    categoryId=tagCategoryId
+  )
 }}
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-item.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-item.hbs
index df7a0723791..2e142f1de98 100644
--- a/app/assets/javascripts/discourse/app/templates/components/reviewable-item.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/reviewable-item.hbs
@@ -30,7 +30,7 @@
             {{component (concat "reviewable-field-" f.type)
               tagName=""
               value=(editable-value reviewable f.id)
-              tagCategoryId=reviewable.category.id
+              tagCategoryId=tagCategoryId
               valueChanged=(action "valueChanged" f.id)
               categoryChanged=(action "categoryChanged")
             }}
diff --git a/app/assets/javascripts/discourse/tests/acceptance/review-test.js b/app/assets/javascripts/discourse/tests/acceptance/review-test.js
index af0fba8465e..c11850249b7 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/review-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/review-test.js
@@ -14,6 +14,21 @@ import { test } from "qunit";
 acceptance("Review", function (needs) {
   needs.user();
 
+  let requests = [];
+
+  needs.pretender((server, helper) => {
+    server.get("/tags/filter/search", (request) => {
+      requests.push(request);
+      return helper.response({
+        results: [
+          { id: "monkey", name: "monkey", count: 1 },
+          { id: "not-monkey", name: "not-monkey", count: 1 },
+          { id: "happy-monkey", name: "happy-monkey", count: 1 },
+        ],
+      });
+    });
+  });
+
   const user = '.reviewable-item[data-reviewable-id="1234"]';
 
   test("It returns a list of reviewable items", async function (assert) {
@@ -160,7 +175,10 @@ acceptance("Review", function (needs) {
     await category.selectRowByValue("6");
 
     let tags = selectKit(`${topic} .payload-tags .mini-tag-chooser`);
+    requests = [];
     await tags.expand();
+    assert.equal(requests.length, 1);
+    assert.equal(requests[0].queryParams.categoryId, "6");
     await tags.fillInFilter("monkey");
     await tags.selectRowByValue("monkey");