diff --git a/app/assets/javascripts/discourse/components/composer-editor.js.es6 b/app/assets/javascripts/discourse/components/composer-editor.js.es6
index f80f94231a7..030e6742af7 100644
--- a/app/assets/javascripts/discourse/components/composer-editor.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-editor.js.es6
@@ -203,9 +203,8 @@ export default Ember.Component.extend({
 
     $element.on("fileuploadsend", (e, data) => {
       this._validUploads++;
-      // add upload placeholders (as much placeholders as valid files dropped)
-      const placeholder = _.times(this._validUploads, () => uploadPlaceholder).join("\n");
-      this.appEvents.trigger('composer:insert-text', placeholder);
+      // add upload placeholders
+      this.appEvents.trigger('composer:insert-text', uploadPlaceholder);
 
       if (data.xhr && data.originalFiles.length === 1) {
         this.set("isCancellable", true);
diff --git a/app/assets/javascripts/discourse/components/d-editor.js.es6 b/app/assets/javascripts/discourse/components/d-editor.js.es6
index d26bdb47b55..da53438cc9f 100644
--- a/app/assets/javascripts/discourse/components/d-editor.js.es6
+++ b/app/assets/javascripts/discourse/components/d-editor.js.es6
@@ -472,10 +472,14 @@ export default Ember.Component.extend({
   },
 
   _addText(sel, text) {
+    const $textarea = this.$('textarea.d-editor-input');
     const insert = `${sel.pre}${text}`;
-    this.set('value', `${insert}${sel.post}`);
-    this._selectText(insert.length, 0);
-    Ember.run.scheduleOnce("afterRender", () => this.$("textarea.d-editor-input").focus());
+    const value = `${insert}${sel.post}`;
+    this.set('value', value);
+    $textarea.val(value);
+    $textarea.prop("selectionStart", insert.length);
+    $textarea.prop("selectionEnd", insert.length);
+    Ember.run.scheduleOnce("afterRender", () => $textarea.focus());
   },
 
   actions: {
diff --git a/app/assets/javascripts/discourse/views/composer.js.es6 b/app/assets/javascripts/discourse/views/composer.js.es6
index 0542b6d8da7..c3ad0afe7b9 100644
--- a/app/assets/javascripts/discourse/views/composer.js.es6
+++ b/app/assets/javascripts/discourse/views/composer.js.es6
@@ -22,7 +22,6 @@ const ComposerView = Ember.View.extend({
   },
 
   movePanels(sizePx) {
-
     $('#main-outlet').css('padding-bottom', sizePx);
 
     // signal the progress bar it should move!