diff --git a/app/assets/javascripts/discourse/components/image-uploader.js.es6 b/app/assets/javascripts/discourse/components/image-uploader.js.es6
index 4173886ebf..2301242fbd 100644
--- a/app/assets/javascripts/discourse/components/image-uploader.js.es6
+++ b/app/assets/javascripts/discourse/components/image-uploader.js.es6
@@ -1,12 +1,13 @@
 import UploadMixin from 'discourse/mixins/upload';
 
 export default Em.Component.extend(UploadMixin, {
+  classNames: ['image-uploader'],
 
   backgroundStyle: function() {
-    var imageUrl = this.get('imageUrl');
+    const imageUrl = this.get('imageUrl');
     if (Em.isNone(imageUrl)) { return; }
 
-    return "background-image: url(" + imageUrl + ")";
+    return ("background-image: url(" + imageUrl + ")").htmlSafe();
   }.property('imageUrl'),
 
   uploadDone: function(data) {
@@ -14,7 +15,7 @@ export default Em.Component.extend(UploadMixin, {
   },
 
   actions: {
-    trash: function() {
+    trash() {
       this.set('imageUrl', null);
 
       // Do we want to signal the delete to the server right away?
diff --git a/app/assets/javascripts/discourse/templates/components/image-uploader.hbs b/app/assets/javascripts/discourse/templates/components/image-uploader.hbs
index be0d1c10b3..9b35716e8e 100644
--- a/app/assets/javascripts/discourse/templates/components/image-uploader.hbs
+++ b/app/assets/javascripts/discourse/templates/components/image-uploader.hbs
@@ -1,4 +1,4 @@
-<div class="uploaded-image-preview" class="input-xxlarge" {{bind-attr style="backgroundStyle"}}>
+<div class="uploaded-image-preview input-xxlarge" style={{backgroundStyle}}>
   <div class="image-upload-controls">
     <label class="btn pad-left no-text {{if uploading 'disabled'}}">
       {{fa-icon "picture-o"}}