diff --git a/app/assets/javascripts/admin/routes/admin-customize-themes-index.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-themes-index.js.es6
new file mode 100644
index 00000000000..b5fc281c1ee
--- /dev/null
+++ b/app/assets/javascripts/admin/routes/admin-customize-themes-index.js.es6
@@ -0,0 +1,5 @@
+export default Ember.Route.extend({
+  setupController() {
+    this.controllerFor("adminCustomizeThemes").set("editingTheme", false);
+  },
+});
diff --git a/app/assets/javascripts/admin/routes/admin-customize-themes.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-themes.js.es6
index 6e5e19b7f51..8291378b051 100644
--- a/app/assets/javascripts/admin/routes/admin-customize-themes.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-customize-themes.js.es6
@@ -8,7 +8,6 @@ export default Ember.Route.extend({
 
   setupController(controller, model) {
     this._super(controller, model);
-    // TODO ColorScheme to model
     controller.set("editingTheme", false);
   },