diff --git a/app/assets/javascripts/admin/controllers/admin-customize-themes-edit.js.es6 b/app/assets/javascripts/admin/controllers/admin-customize-themes-edit.js.es6 index e5c21b4c6fb..c4407b53d49 100644 --- a/app/assets/javascripts/admin/controllers/admin-customize-themes-edit.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-customize-themes-edit.js.es6 @@ -37,9 +37,9 @@ export default Ember.Controller.extend({ return this.shouldShow('mobile'); }, - @computed('onlyOverridden') + @computed('onlyOverridden', 'model.remote_theme') showSettings() { - return this.shouldShow('settings'); + return this.shouldShow('settings') && !this.get('model.remote_theme'); }, @observes('onlyOverridden') diff --git a/app/assets/javascripts/admin/controllers/admin-customize-themes-show.js.es6 b/app/assets/javascripts/admin/controllers/admin-customize-themes-show.js.es6 index b1cf6b1eddb..b8850b10f8f 100644 --- a/app/assets/javascripts/admin/controllers/admin-customize-themes-show.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-customize-themes-show.js.es6 @@ -31,7 +31,7 @@ export default Ember.Controller.extend({ return text + ": " + localized.join(" , "); } }; - ['common', 'desktop', 'mobile', 'settings'].forEach(target => { + ['common', 'desktop', 'mobile'].forEach(target => { descriptions.push(description(target)); }); return descriptions.reject(d=>Em.isBlank(d));