diff --git a/app/assets/javascripts/admin/addon/components/site-settings/category-list.gjs b/app/assets/javascripts/admin/addon/components/site-settings/category-list.gjs
new file mode 100644
index 00000000000..c180dc0716d
--- /dev/null
+++ b/app/assets/javascripts/admin/addon/components/site-settings/category-list.gjs
@@ -0,0 +1,28 @@
+import Component from "@ember/component";
+import { action, computed } from "@ember/object";
+import Category from "discourse/models/category";
+import htmlSafe from "discourse-common/helpers/html-safe";
+import SettingValidationMessage from "admin/components/setting-validation-message";
+import CategorySelector from "select-kit/components/category-selector";
+
+export default class CategoryList extends Component {
+  @computed("value")
+  get selectedCategories() {
+    return Category.findByIds(this.value.split("|").filter(Boolean));
+  }
+
+  @action
+  onChangeSelectedCategories(value) {
+    this.set("value", (value || []).mapBy("id").join("|"));
+  }
+
+  <template>
+    <CategorySelector
+      @categories={{this.selectedCategories}}
+      @onChange={{this.onChangeSelectedCategories}}
+    />
+
+    <div class="desc">{{htmlSafe this.setting.description}}</div>
+    <SettingValidationMessage @message={{this.validationMessage}} />
+  </template>
+}
diff --git a/app/assets/javascripts/admin/addon/components/site-settings/category-list.hbs b/app/assets/javascripts/admin/addon/components/site-settings/category-list.hbs
deleted file mode 100644
index 473a7549897..00000000000
--- a/app/assets/javascripts/admin/addon/components/site-settings/category-list.hbs
+++ /dev/null
@@ -1,7 +0,0 @@
-<CategorySelector
-  @categories={{this.selectedCategories}}
-  @onChange={{this.onChangeSelectedCategories}}
-/>
-
-<div class="desc">{{html-safe this.setting.description}}</div>
-<SettingValidationMessage @message={{this.validationMessage}} />
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/addon/components/site-settings/category-list.js b/app/assets/javascripts/admin/addon/components/site-settings/category-list.js
deleted file mode 100644
index 65966787210..00000000000
--- a/app/assets/javascripts/admin/addon/components/site-settings/category-list.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import Component from "@ember/component";
-import { action, computed } from "@ember/object";
-import Category from "discourse/models/category";
-
-export default class CategoryList extends Component {
-  @computed("value")
-  get selectedCategories() {
-    return Category.findByIds(this.value.split("|").filter(Boolean));
-  }
-
-  @action
-  onChangeSelectedCategories(value) {
-    this.set("value", (value || []).mapBy("id").join("|"));
-  }
-}