diff --git a/app/assets/javascripts/admin/controllers/admin-customize-email-templates.js.es6 b/app/assets/javascripts/admin/controllers/admin-customize-email-templates.js.es6
index 7bf7659f657..8631babc672 100644
--- a/app/assets/javascripts/admin/controllers/admin-customize-email-templates.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-customize-email-templates.js.es6
@@ -6,5 +6,11 @@ export default Ember.Controller.extend({
     this._super(...arguments);
 
     this.titleSorting = ["title"];
+  },
+
+  actions: {
+    selectTemplate(template) {
+      this.transitionToRoute("adminCustomizeEmailTemplates.edit", template);
+    }
   }
 });
diff --git a/app/assets/javascripts/admin/templates/customize-email-templates.hbs b/app/assets/javascripts/admin/templates/customize-email-templates.hbs
index 7dd95b092f5..d89624e477f 100644
--- a/app/assets/javascripts/admin/templates/customize-email-templates.hbs
+++ b/app/assets/javascripts/admin/templates/customize-email-templates.hbs
@@ -1,15 +1,8 @@
-<div class='row'>
-  <div class='content-list'>
-    <ul>
-      {{#each sortedTemplates as |et|}}
-        <li>
-          {{#link-to 'adminCustomizeEmailTemplates.edit' et}}{{et.title}}{{/link-to}}
-        </li>
-      {{/each}}
-    </ul>
-  </div>
+{{combo-box
+  content=sortedTemplates
+  valueAttribute="id"
+  nameProperty="title"
+  onSelect=(action "selectTemplate")
+}}
 
-  <div class='content-editor'>
-    {{outlet}}
-  </div>
-</div>
+{{outlet}}
diff --git a/app/assets/stylesheets/common/admin/customize.scss b/app/assets/stylesheets/common/admin/customize.scss
index ce30f493126..11c3a5ccfaf 100644
--- a/app/assets/stylesheets/common/admin/customize.scss
+++ b/app/assets/stylesheets/common/admin/customize.scss
@@ -791,6 +791,17 @@
   }
 }
 
+.admin-customize-email-templates {
+  .email-template,
+  .controls {
+    margin-top: 1em;
+  }
+
+  .d-editor {
+    height: 50vh;
+  }
+}
+
 .admin-customize-email-style {
   .ace-wrapper {
     position: relative;