diff --git a/app/assets/javascripts/admin/addon/services/admin-tools.js b/app/assets/javascripts/admin/addon/services/admin-tools.js
index fe282fefd6b..a90df7de8ee 100644
--- a/app/assets/javascripts/admin/addon/services/admin-tools.js
+++ b/app/assets/javascripts/admin/addon/services/admin-tools.js
@@ -1,8 +1,4 @@
 import AdminUser from "admin/models/admin-user";
-// A service that can act as a bridge between the front end Discourse application
-// and the admin application. Use this if you need front end code to access admin
-// modules. Inject it optionally, and if it exists go to town!
-
 import I18n from "I18n";
 import { Promise } from "rsvp";
 import Service from "@ember/service";
@@ -12,14 +8,10 @@ import { getOwner } from "discourse-common/lib/get-owner";
 import { iconHTML } from "discourse-common/lib/icon-library";
 import showModal from "discourse/lib/show-modal";
 
+// A service that can act as a bridge between the front end Discourse application
+// and the admin application. Use this if you need front end code to access admin
+// modules. Inject it optionally, and if it exists go to town!
 export default Service.extend({
-  init() {
-    this._super(...arguments);
-
-    // TODO: Make `siteSettings` a service that can be injected
-    this.siteSettings = getOwner(this).lookup("site-settings:main");
-  },
-
   showActionLogs(target, filters) {
     const controller = getOwner(target).lookup(
       "controller:adminLogs.staffActionLogs"
diff --git a/app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js b/app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js
index 93efb024165..f3bd4367c37 100644
--- a/app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js
+++ b/app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js
@@ -744,9 +744,7 @@ export default {
   },
 
   categoriesTopicsList() {
-    const setting = this.container.lookup("site-settings:main")
-      .desktop_category_page_style;
-    switch (setting) {
+    switch (this.siteSettings.desktop_category_page_style) {
       case "categories_with_featured_topics":
         return $(".latest .featured-topic");
       case "categories_and_latest_topics":