diff --git a/app/assets/javascripts/admin/controllers/admin_site_settings_controller.js b/app/assets/javascripts/admin/controllers/admin_site_settings_controller.js
index 7457725141..3aaac85dc8 100644
--- a/app/assets/javascripts/admin/controllers/admin_site_settings_controller.js
+++ b/app/assets/javascripts/admin/controllers/admin_site_settings_controller.js
@@ -13,7 +13,7 @@ Discourse.AdminSiteSettingsController = Ember.ArrayController.extend(Discourse.P
   /**
     The list of settings based on the current filters
 
-    @property filteredContent
+    @property filterContent
   **/
   filterContent: function() {
 
diff --git a/app/assets/javascripts/admin/routes/admin_site_settings_category_route.js b/app/assets/javascripts/admin/routes/admin_site_settings_category_route.js
index 531749f0fe..9e463c8054 100644
--- a/app/assets/javascripts/admin/routes/admin_site_settings_category_route.js
+++ b/app/assets/javascripts/admin/routes/admin_site_settings_category_route.js
@@ -9,5 +9,8 @@
 Discourse.AdminSiteSettingsCategoryRoute = Discourse.Route.extend({
   model: function(params) {
     this.controllerFor('adminSiteSettingsCategory').set('categoryNameKey', params.category_id);
+    return this.modelFor('adminSiteSettings').find(function(category) {
+      return category.nameKey === params.category_id;
+    });
   }
 });