diff --git a/app/assets/javascripts/discourse/components/edit-category-tab.js.es6 b/app/assets/javascripts/discourse/components/edit-category-tab.js.es6
index 02be5aa5e6f..0eaa00ff84c 100644
--- a/app/assets/javascripts/discourse/components/edit-category-tab.js.es6
+++ b/app/assets/javascripts/discourse/components/edit-category-tab.js.es6
@@ -5,6 +5,10 @@ export default Em.Component.extend({
   active: Discourse.computed.propertyEqual('selectedTab', 'tab'),
   title: Discourse.computed.i18n('tab', 'category.%@'),
 
+  _insertInParent: function() {
+    this.get('parentView.panels').addObject(this.get('tab'));
+  }.on('didInsertElement'),
+
   actions: {
     select: function() {
       this.set('selectedTab', this.get('tab'));
diff --git a/app/assets/javascripts/discourse/templates/modal/edit-category.js.handlebars b/app/assets/javascripts/discourse/templates/modal/edit-category.js.handlebars
index 40c1e83e54a..e40e61f5515 100644
--- a/app/assets/javascripts/discourse/templates/modal/edit-category.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/modal/edit-category.js.handlebars
@@ -8,12 +8,11 @@
   </ul>
 
   <div class="modal-body">
-    {{view 'edit-category-panel' tab="general" className="general-tab"}}
-    {{#unless isUncategorizedCategory}}
-      {{view 'edit-category-panel' tab="security" className="options-tab"}}
-      {{view 'edit-category-panel' tab="settings" className="options-tab"}}
-    {{/unless}}
+    {{#each tab in view.panels}}
+      {{view 'edit-category-panel' tab=tab}}
+    {{/each}}
   </div>
+
   <div class="modal-footer">
     <button class='btn btn-primary' {{bind-attr disabled="disabled"}} {{action saveCategory}}>{{buttonTitle}}</button>
     {{#if can_delete}}
diff --git a/app/assets/javascripts/discourse/views/edit-category-panel.js.es6 b/app/assets/javascripts/discourse/views/edit-category-panel.js.es6
index d9a0610e82d..fcf77c5763e 100644
--- a/app/assets/javascripts/discourse/views/edit-category-panel.js.es6
+++ b/app/assets/javascripts/discourse/views/edit-category-panel.js.es6
@@ -1,6 +1,5 @@
 export default Em.View.extend({
   classNameBindings: [':modal-tab', 'invisible'],
-
   invisible: Discourse.computed.propertyNotEqual('controller.selectedTab', 'tab'),
 
   templateName: function() {
diff --git a/app/assets/javascripts/discourse/views/edit-category.js.es6 b/app/assets/javascripts/discourse/views/edit-category.js.es6
index a79eb6b5e3f..6d0fb05a5cc 100644
--- a/app/assets/javascripts/discourse/views/edit-category.js.es6
+++ b/app/assets/javascripts/discourse/views/edit-category.js.es6
@@ -1,3 +1,7 @@
 export default Discourse.ModalBodyView.extend({
-  templateName: 'modal/edit-category'
+  templateName: 'modal/edit-category',
+
+  _initializePanels: function() {
+    this.set('panels', []);
+  }.on('init')
 });