diff --git a/app/assets/javascripts/admin/templates/components/site-settings/enum.hbs b/app/assets/javascripts/admin/templates/components/site-settings/enum.hbs
index 765a0e20d19..9b3da3178e3 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/enum.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/enum.hbs
@@ -1,4 +1,4 @@
-{{combo-box valueAttribute="value" content=setting.validValues value=value none=setting.allowsNone}}
+{{combo-box castInteger=true valueAttribute="value" content=setting.validValues value=value none=setting.allowsNone}}
{{preview}}
{{setting-validation-message message=validationMessage}}
{{{unbound setting.description}}}
diff --git a/app/assets/javascripts/select-box-kit/mixins/utils.js.es6 b/app/assets/javascripts/select-box-kit/mixins/utils.js.es6
index 3ece47cc3bf..475cf726fcc 100644
--- a/app/assets/javascripts/select-box-kit/mixins/utils.js.es6
+++ b/app/assets/javascripts/select-box-kit/mixins/utils.js.es6
@@ -13,8 +13,12 @@ export default Ember.Mixin.create({
return content;
},
+ _isNumeric(input) {
+ return !isNaN(parseFloat(input)) && isFinite(input);
+ },
+
_castInteger(value) {
- if (this.get("castInteger") === true && Ember.isPresent(value)) {
+ if (this.get("castInteger") === true && Ember.isPresent(value) && this._isNumeric(value)) {
return parseInt(value, 10);
}