diff --git a/app/assets/javascripts/admin/components/list_setting_component.js b/app/assets/javascripts/admin/components/list_setting_component.js
index 4676e0905a5..6a1b2be7d97 100644
--- a/app/assets/javascripts/admin/components/list_setting_component.js
+++ b/app/assets/javascripts/admin/components/list_setting_component.js
@@ -17,7 +17,7 @@ Discourse.ListSettingComponent = Ember.Component.extend({
     this.$("input").select2({
         multiple: false,
         separator: "|",
-        tokenSeparators: [",", " ", "|"],
+        tokenSeparators: ["|"],
         tags : this.get("choices") || [],
         width: 'off'
       }).on("change", function(obj) {
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 5e746d4248c..1448613c494 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -58,6 +58,15 @@ basic:
     refresh: true
     list: true
     default: 'latest|new|unread|starred|top|categories'
+    choices:
+     - latest
+     - new
+     - unread
+     - starred
+     - top
+     - categories
+     - read
+     - posted
   post_menu:
     client: true
     list: true