diff --git a/app/assets/javascripts/admin/controllers/admin-site-settings-category.js.es6 b/app/assets/javascripts/admin/controllers/admin-site-settings-category.js.es6
index c2f8c09d547..a5831299ece 100644
--- a/app/assets/javascripts/admin/controllers/admin-site-settings-category.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-site-settings-category.js.es6
@@ -4,7 +4,7 @@ export default Ember.Controller.extend({
   categoryNameKey: null,
   adminSiteSettings: Ember.inject.controller(),
 
-  @computed("adminSiteSettings.visible", "categoryNameKey")
+  @computed("adminSiteSettings.visibleSiteSettings", "categoryNameKey")
   category(categories, nameKey) {
     return (categories || []).findBy("nameKey", nameKey);
   },
diff --git a/app/assets/javascripts/admin/controllers/admin-site-settings.js.es6 b/app/assets/javascripts/admin/controllers/admin-site-settings.js.es6
index 85eac471747..25420b562dd 100644
--- a/app/assets/javascripts/admin/controllers/admin-site-settings.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-site-settings.js.es6
@@ -3,7 +3,7 @@ import debounce from "discourse/lib/debounce";
 export default Ember.Controller.extend({
   filter: null,
   allSiteSettings: Ember.computed.alias("model"),
-  visible: null,
+  visibleSiteSettings: null,
   onlyOverridden: false,
 
   filterContentNow(category) {
@@ -16,7 +16,7 @@ export default Ember.Controller.extend({
     }
 
     if ((!filter || 0 === filter.length) && !this.get("onlyOverridden")) {
-      this.set("visible", this.get("allSiteSettings"));
+      this.set("visibleSiteSettings", this.get("allSiteSettings"));
       this.transitionToRoute("adminSiteSettings");
       return;
     }
@@ -64,7 +64,7 @@ export default Ember.Controller.extend({
     all.hasMore = matches.length > 30;
     all.count = all.hasMore ? "30+" : matches.length;
 
-    this.set("visible", matchesGroupedByCategory);
+    this.set("visibleSiteSettings", matchesGroupedByCategory);
     this.transitionToRoute(
       "adminSiteSettingsCategory",
       category || "all_results"
diff --git a/app/assets/javascripts/admin/routes/admin-site-settings-index.js.es6 b/app/assets/javascripts/admin/routes/admin-site-settings-index.js.es6
index ea8f10c85ee..59e851e5096 100644
--- a/app/assets/javascripts/admin/routes/admin-site-settings-index.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-site-settings-index.js.es6
@@ -6,7 +6,8 @@ export default Discourse.Route.extend({
   beforeModel() {
     this.replaceWith(
       "adminSiteSettingsCategory",
-      this.controllerFor("adminSiteSettings").get("visible")[0].nameKey
+      this.controllerFor("adminSiteSettings").get("visibleSiteSettings")[0]
+        .nameKey
     );
   }
 });
diff --git a/app/assets/javascripts/admin/routes/admin-site-settings.js.es6 b/app/assets/javascripts/admin/routes/admin-site-settings.js.es6
index 6aecdbdb998..58ac7246f53 100644
--- a/app/assets/javascripts/admin/routes/admin-site-settings.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-site-settings.js.es6
@@ -12,8 +12,8 @@ export default Discourse.Route.extend({
   afterModel(siteSettings) {
     const controller = this.controllerFor("adminSiteSettings");
 
-    if (!controller.get("visible")) {
-      controller.set("visible", siteSettings);
+    if (!controller.get("visibleSiteSettings")) {
+      controller.set("visibleSiteSettings", siteSettings);
     }
   }
 });
diff --git a/app/assets/javascripts/admin/templates/site-settings.hbs b/app/assets/javascripts/admin/templates/site-settings.hbs
index 6b7c9a8a936..4cdf577962a 100644
--- a/app/assets/javascripts/admin/templates/site-settings.hbs
+++ b/app/assets/javascripts/admin/templates/site-settings.hbs
@@ -15,7 +15,7 @@
 
 <div class="admin-nav pull-left">
   <ul class="nav nav-stacked">
-    {{#each visible as |category|}}
+    {{#each visibleSiteSettings as |category|}}
       <li class="{{category.nameKey}}">
         {{#link-to 'adminSiteSettingsCategory' category.nameKey class=category.nameKey}}
           {{category.name}}