diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 852d1d8cd9d..2a4085f785e 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -59,7 +59,6 @@
 //= require ./discourse/models/user-badge
 //= require ./discourse/controllers/discovery-sortable
 //= require ./discourse/controllers/navigation/default
-//= require ./discourse/views/modal-body
 //= require ./discourse/components/edit-category-panel
 //= require ./discourse/components/dropdown-button
 //= require ./discourse/components/notifications-button
diff --git a/app/assets/javascripts/discourse/components/d-modal-body.js.es6 b/app/assets/javascripts/discourse/components/d-modal-body.js.es6
index 0753cf4fef7..fa2d8fa168c 100644
--- a/app/assets/javascripts/discourse/components/d-modal-body.js.es6
+++ b/app/assets/javascripts/discourse/components/d-modal-body.js.es6
@@ -22,8 +22,6 @@ export default Ember.Component.extend({
       }
     }
 
-    this.appEvents.trigger('modal:body-shown', {
-      title: this.get('title')
-    });
+    this.appEvents.trigger('modal:body-shown', this.getProperties('title'));
   }
 });
diff --git a/app/assets/javascripts/discourse/lib/show-modal.js.es6 b/app/assets/javascripts/discourse/lib/show-modal.js.es6
index 6b5b91c9d96..e34d7398ef0 100644
--- a/app/assets/javascripts/discourse/lib/show-modal.js.es6
+++ b/app/assets/javascripts/discourse/lib/show-modal.js.es6
@@ -18,7 +18,7 @@ export default function(name, opts) {
   } else {
     const templateName = opts.templateName || Ember.String.dasherize(name);
 
-    const renderArgs = { into: 'modal', outlet: 'modalBody', view: 'modal-body'};
+    const renderArgs = { into: 'modal', outlet: 'modalBody'};
     if (controller) { renderArgs.controller = controllerName; }
 
     const modalName = `modal/${templateName}`;
diff --git a/app/assets/javascripts/discourse/routes/application.js.es6 b/app/assets/javascripts/discourse/routes/application.js.es6
index e2c3aa3f6aa..187199ff533 100644
--- a/app/assets/javascripts/discourse/routes/application.js.es6
+++ b/app/assets/javascripts/discourse/routes/application.js.es6
@@ -127,12 +127,12 @@ const ApplicationRoute = Discourse.Route.extend(OpenComposer, {
     },
 
     editCategory(category) {
-      Category.reloadById(category.get('id')).then((atts) => {
+      Category.reloadById(category.get('id')).then(atts => {
         const model = this.store.createRecord('category', atts.category);
         model.setupGroupsAndPermissions();
         this.site.updateCategory(model);
-        showModal('editCategory', { model });
-        this.controllerFor('editCategory').set('selectedTab', 'general');
+        showModal('edit-category', { model });
+        this.controllerFor('edit-category').set('selectedTab', 'general');
       });
     },
 
diff --git a/app/assets/javascripts/discourse/routes/discovery-categories.js.es6 b/app/assets/javascripts/discourse/routes/discovery-categories.js.es6
index 13fecc98f80..ad7118fcc0e 100644
--- a/app/assets/javascripts/discourse/routes/discovery-categories.js.es6
+++ b/app/assets/javascripts/discourse/routes/discovery-categories.js.es6
@@ -117,8 +117,8 @@ const DiscoveryCategoriesRoute = Discourse.Route.extend(OpenComposer, {
         allow_badges: true
       });
 
-      showModal("editCategory", { model });
-      this.controllerFor("editCategory").set("selectedTab", "general");
+      showModal("edit-category", { model });
+      this.controllerFor("edit-category").set("selectedTab", "general");
     },
 
     reorderCategories() {
diff --git a/app/assets/javascripts/discourse/templates/modal/change-owner.hbs b/app/assets/javascripts/discourse/templates/modal/change-owner.hbs
index fea9e119d25..c23cefd4692 100644
--- a/app/assets/javascripts/discourse/templates/modal/change-owner.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/change-owner.hbs
@@ -1,4 +1,4 @@
-<div class="modal-body">
+{{#d-modal-body}}
   {{{i18n 'topic.change_owner.instructions' count=selectedPostsCount old_user=selectedPostsUsername}}}
   <p>
       {{{i18n 'topic.change_owner.instructions_warn'}}}
@@ -8,8 +8,7 @@
       <label>{{i18n 'topic.change_owner.label'}}</label>
     {{user-selector single="true" usernames=new_user placeholderKey="topic.change_owner.placeholder"}}
   </form>
-
-</div>
+{{/d-modal-body}}
 
 <div class="modal-footer">
   <button class='btn btn-primary' disabled={{buttonDisabled}} {{action "changeOwnershipOfPosts"}}>{{buttonTitle}}</button>
diff --git a/app/assets/javascripts/discourse/templates/modal/change-timestamp.hbs b/app/assets/javascripts/discourse/templates/modal/change-timestamp.hbs
index 1c0dd7bf83b..7a06c27623f 100644
--- a/app/assets/javascripts/discourse/templates/modal/change-timestamp.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/change-timestamp.hbs
@@ -1,4 +1,4 @@
-<div class="modal-body change-timestamp">
+{{#d-modal-body class="change-timestamp"}}
   <p>
     {{i18n 'topic.change_timestamp.instructions'}}
   </p>
@@ -13,7 +13,7 @@
   </form>
 
   <div id="date-container" />
-</div>
+{{/d-modal-body}}
 
 <div class="modal-footer">
   <button class="btn btn-primary" disabled={{buttonDisabled}} {{action "changeTimestamp"}}>{{buttonTitle}}</button>
diff --git a/app/assets/javascripts/discourse/templates/modal/dismiss-read.hbs b/app/assets/javascripts/discourse/templates/modal/dismiss-read.hbs
index 333e84556f5..4dc7a96b32c 100644
--- a/app/assets/javascripts/discourse/templates/modal/dismiss-read.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/dismiss-read.hbs
@@ -1,8 +1,8 @@
-<div class="modal-body">
+{{#d-modal-body}}
   <p>
     {{preference-checkbox labelKey="topics.bulk.also_dismiss_topics" checked=dismissTopics}}
   </p>
-</div>
+{{/d-modal-body}}
 
 <div class="modal-footer">
   <button class='btn btn-primary' {{action "dismissReadTopics" dismissTopics}}><i class="fa fa-check"></i> {{i18n 'topics.bulk.dismiss'}}</button>
diff --git a/app/assets/javascripts/discourse/templates/modal/edit-category.hbs b/app/assets/javascripts/discourse/templates/modal/edit-category.hbs
index 10282704c8f..fbbafa353f8 100644
--- a/app/assets/javascripts/discourse/templates/modal/edit-category.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/edit-category.hbs
@@ -12,11 +12,11 @@
     {{/if}}
   </ul>
 
-  <div class="modal-body">
+  {{#d-modal-body}}
     {{#each panels as |tab|}}
       {{component tab selectedTab=selectedTab category=model}}
     {{/each}}
-  </div>
+  {{/d-modal-body}}
 
   <div class="modal-footer">
     {{d-button id="save-category" class="btn-primary" disabled=disabled action="saveCategory" label=saveLabel}}
diff --git a/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs b/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs
index cbe81d04cb9..aebd7ad77f7 100644
--- a/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs
@@ -1,4 +1,4 @@
-<div class="modal-body feature-topic">
+{{#d-modal-body class="feature-topic"}}
   {{#if model.pinned_at}}
     <div class="feature-section">
       <div class="desc">
@@ -105,7 +105,7 @@
       </p>
     </div>
   </div>
-</div>
+{{/d-modal-body}}
 <div class="modal-footer">
   <a class="pull-right" {{action "closeModal"}}>{{i18n "cancel"}}</a>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs b/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
index 3e6adc0fd25..1ffb3e2c337 100644
--- a/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
@@ -1,4 +1,4 @@
-<div id="keyboard-shortcuts-help" class="modal-body">
+{{#d-modal-body id="keyboard-shortcuts-help"}}
   <div class="row">
     <div class="span6">
       <h4>{{i18n 'keyboard_shortcuts_help.jump_to.title'}}</h4>
@@ -60,4 +60,4 @@
       </ul>
     </div>
   </div>
-</div>
+{{/d-modal-body}}
diff --git a/app/assets/javascripts/discourse/templates/modal/merge-topic.hbs b/app/assets/javascripts/discourse/templates/modal/merge-topic.hbs
index e8e3be1432b..8cd51857b7c 100644
--- a/app/assets/javascripts/discourse/templates/modal/merge-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/merge-topic.hbs
@@ -1,10 +1,10 @@
-<div id='move-selected' class="modal-body">
+{{#d-modal-body id='move-selected'}}
   <p>{{{i18n 'topic.merge_topic.instructions' count=selectedPostsCount}}}</p>
 
   <form>
     {{choose-topic currentTopicId=model.id selectedTopicId=selectedTopicId}}
   </form>
-</div>
+{{/d-modal-body}}
 
 <div class="modal-footer">
   {{#d-button class="btn-primary" disabled=buttonDisabled action="movePostsToExistingTopic"}}
diff --git a/app/assets/javascripts/discourse/templates/modal/not-activated.hbs b/app/assets/javascripts/discourse/templates/modal/not-activated.hbs
index 9d6620cbca6..f8e4aeee297 100644
--- a/app/assets/javascripts/discourse/templates/modal/not-activated.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/not-activated.hbs
@@ -1,11 +1,12 @@
-<div class="modal-body">
+{{#d-modal-body}}
   {{#if emailSent}}
     {{{i18n 'login.sent_activation_email_again' currentEmail=currentEmail}}}
   {{else}}
     {{{i18n 'login.not_activated' sentTo=sentTo}}}
     <a href {{action "sendActivationEmail"}} class="resend-link">{{i18n 'login.resend_activation_email'}}</a>
   {{/if}}
-</div>
+{{/d-modal-body}}
+
 <div class="modal-footer">
   <button class='btn btn-primary' {{action "closeModal"}}>{{i18n 'close'}}</button>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/option-boolean.hbs b/app/assets/javascripts/discourse/templates/modal/option-boolean.hbs
deleted file mode 100644
index 0bd9448b5aa..00000000000
--- a/app/assets/javascripts/discourse/templates/modal/option-boolean.hbs
+++ /dev/null
@@ -1,6 +0,0 @@
-<label>
-  {{input type="checkbox" checked=checked}}
-  {{title}}
-</label>
-
-{{description}}
diff --git a/app/assets/javascripts/discourse/templates/modal/post-enqueued.hbs b/app/assets/javascripts/discourse/templates/modal/post-enqueued.hbs
index 95065ab9caf..992e9bb8ac6 100644
--- a/app/assets/javascripts/discourse/templates/modal/post-enqueued.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/post-enqueued.hbs
@@ -1,8 +1,8 @@
-<div class="modal-body">
+{{#d-modal-body}}
   <p>{{{description}}}</p>
 
   <p>{{{i18n "queue.approval.pending_posts" count=model.pending_count}}}</p>
-</div>
+{{/d-modal-body}}
 <div class="modal-footer">
   {{d-button action="closeModal" class="btn-primary" label="queue.approval.ok"}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/search-help.hbs b/app/assets/javascripts/discourse/templates/modal/search-help.hbs
index 044ded43300..68c7cead8e2 100644
--- a/app/assets/javascripts/discourse/templates/modal/search-help.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/search-help.hbs
@@ -1,6 +1,6 @@
-<div id="search-help" class="modal-body">
+{{#d-modal-body id="search-help"}}
   {{{model}}}
   {{#if showGoogleSearch}}
     {{{i18n 'google_search'}}}
   {{/if}}
-</div>
+{{/d-modal-body}}
diff --git a/app/assets/javascripts/discourse/templates/modal/topic-bulk-actions.hbs b/app/assets/javascripts/discourse/templates/modal/topic-bulk-actions.hbs
index 3e4734e9daa..caa2e71d2ab 100644
--- a/app/assets/javascripts/discourse/templates/modal/topic-bulk-actions.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/topic-bulk-actions.hbs
@@ -1,7 +1,4 @@
-<div class='modal-body'>
-
+{{#d-modal-body}}
   <p>{{{i18n 'topics.bulk.selected' count=model.length}}}</p>
-
   {{outlet "bulkOutlet"}}
-
-</div>
+{{/d-modal-body}}
diff --git a/app/assets/javascripts/discourse/views/modal.js.es6 b/app/assets/javascripts/discourse/views/modal.js.es6
index fb9869db205..10599d23749 100644
--- a/app/assets/javascripts/discourse/views/modal.js.es6
+++ b/app/assets/javascripts/discourse/views/modal.js.es6
@@ -18,7 +18,9 @@ export default Ember.View.extend({
     });
 
     this.appEvents.on('modal:body-shown', data => {
-      this.set('controller.title', I18n.t(data.title));
+      if (data.title) {
+        this.set('controller.title', I18n.t(data.title));
+      }
     });
   },
 
diff --git a/plugins/poll/assets/javascripts/discourse/templates/modals/poll-ui-builder.hbs b/plugins/poll/assets/javascripts/discourse/templates/modal/poll-ui-builder.hbs
similarity index 95%
rename from plugins/poll/assets/javascripts/discourse/templates/modals/poll-ui-builder.hbs
rename to plugins/poll/assets/javascripts/discourse/templates/modal/poll-ui-builder.hbs
index ed01df734d7..a3e7566f58b 100644
--- a/plugins/poll/assets/javascripts/discourse/templates/modals/poll-ui-builder.hbs
+++ b/plugins/poll/assets/javascripts/discourse/templates/modal/poll-ui-builder.hbs
@@ -1,4 +1,4 @@
-<div class="modal-body poll-ui-builder">
+{{#d-modal-body title="poll.ui_builder.title" class="poll-ui-builder"}}
   <form class="poll-ui-builder-form form-horizontal">
     <div class="input-group">
       <label class="input-group-label">{{i18n 'poll.ui_builder.poll_type.label'}}</label>
@@ -52,7 +52,7 @@
       </div>
     {{/unless}}
   </form>
-</div>
+{{/d-modal-body}}
 
 <div class="modal-footer">
   {{d-button action="insertPoll" icon="bar-chart-o" class='btn-primary' label='poll.ui_builder.insert' disabled=disableInsert}}
diff --git a/plugins/poll/assets/javascripts/views/poll-ui-builder.js.es6 b/plugins/poll/assets/javascripts/views/poll-ui-builder.js.es6
deleted file mode 100644
index 52144834366..00000000000
--- a/plugins/poll/assets/javascripts/views/poll-ui-builder.js.es6
+++ /dev/null
@@ -1,6 +0,0 @@
-import ModalBodyView from "discourse/views/modal-body";
-
-export default ModalBodyView.extend({
-  templateName: 'modals/poll-ui-builder',
-  title: I18n.t("poll.ui_builder.title")
-});