diff --git a/app/assets/javascripts/discourse/app/controllers/navigation/categories.js b/app/assets/javascripts/discourse/app/controllers/navigation/categories.js
index 61a1678df3c..e39a8c8a750 100644
--- a/app/assets/javascripts/discourse/app/controllers/navigation/categories.js
+++ b/app/assets/javascripts/discourse/app/controllers/navigation/categories.js
@@ -1,6 +1,6 @@
 import NavigationDefaultController from "discourse/controllers/navigation/default";
 import { inject as controller } from "@ember/controller";
 
-export default NavigationDefaultController.extend({
-  discoveryCategories: controller("discovery/categories"),
-});
+export default class NavigationCategoriesController extends NavigationDefaultController {
+  @controller("discovery/categories") discoveryCategories;
+}
diff --git a/app/assets/javascripts/discourse/app/controllers/navigation/category.js b/app/assets/javascripts/discourse/app/controllers/navigation/category.js
index 2ff17f2a080..4ca0ad0c5cf 100644
--- a/app/assets/javascripts/discourse/app/controllers/navigation/category.js
+++ b/app/assets/javascripts/discourse/app/controllers/navigation/category.js
@@ -1,11 +1,6 @@
-import { and, none } from "@ember/object/computed";
 import FilterModeMixin from "discourse/mixins/filter-mode";
 import NavigationDefaultController from "discourse/controllers/navigation/default";
 
-export default NavigationDefaultController.extend(FilterModeMixin, {
-  showingParentCategory: none("category.parentCategory"),
-  showingSubcategoryList: and(
-    "category.show_subcategory_list",
-    "showingParentCategory"
-  ),
-});
+export default class NavigationCategoryController extends NavigationDefaultController.extend(
+  FilterModeMixin
+) {}
diff --git a/app/assets/javascripts/discourse/app/controllers/navigation/default.js b/app/assets/javascripts/discourse/app/controllers/navigation/default.js
index 2e46e7abb17..67224fea715 100644
--- a/app/assets/javascripts/discourse/app/controllers/navigation/default.js
+++ b/app/assets/javascripts/discourse/app/controllers/navigation/default.js
@@ -1,15 +1,15 @@
+import { inject as service } from "@ember/service";
 import Controller, { inject as controller } from "@ember/controller";
 import FilterModeMixin from "discourse/mixins/filter-mode";
-import discourseComputed from "discourse-common/utils/decorators";
-import { inject as service } from "@ember/service";
 import { TRACKED_QUERY_PARAM_VALUE } from "discourse/lib/topic-list-tracked-filter";
 
-export default Controller.extend(FilterModeMixin, {
-  discovery: controller(),
-  router: service(),
+export default class NavigationDefaultController extends Controller.extend(
+  FilterModeMixin
+) {
+  @service router;
+  @controller discovery;
 
-  @discourseComputed("router.currentRoute.queryParams.f")
-  skipCategoriesNavItem(filterParamValue) {
-    return filterParamValue === TRACKED_QUERY_PARAM_VALUE;
-  },
-});
+  get skipCategoriesNavItem() {
+    return this.router.currentRoute.queryParams.f === TRACKED_QUERY_PARAM_VALUE;
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/controllers/navigation/filter.js b/app/assets/javascripts/discourse/app/controllers/navigation/filter.js
index 40ba9b8e344..d58c65742d2 100644
--- a/app/assets/javascripts/discourse/app/controllers/navigation/filter.js
+++ b/app/assets/javascripts/discourse/app/controllers/navigation/filter.js
@@ -4,7 +4,7 @@ import { action } from "@ember/object";
 import { bind } from "discourse-common/utils/decorators";
 import discourseDebounce from "discourse-common/lib/debounce";
 
-export default class extends Controller {
+export default class NavigationFilterController extends Controller {
   @controller("discovery/filter") discoveryFilter;
 
   @tracked copyIcon = "link";