diff --git a/app/assets/javascripts/discourse/components/d-editor.js.es6 b/app/assets/javascripts/discourse/components/d-editor.js.es6
index 9adf1c71ad0..4463d1f4531 100644
--- a/app/assets/javascripts/discourse/components/d-editor.js.es6
+++ b/app/assets/javascripts/discourse/components/d-editor.js.es6
@@ -77,7 +77,11 @@ class Toolbar {
       group: 'insertions',
       icon: 'quote-right',
       shortcut: 'Shift+9',
-      perform: e => e.applyList('> ', 'blockquote_text')
+      perform: e => e.applyList(
+        '> ',
+        'blockquote_text',
+        { applyEmptyLines: true, multiline: true }
+      )
     });
 
     this.addButton({id: 'code', group: 'insertions', shortcut: 'Shift+C', action: 'formatCode'});
@@ -440,11 +444,15 @@ export default Ember.Component.extend({
   },
 
   // perform the same operation over many lines of text
-  _getMultilineContents(lines, head, hval, hlen, tail, tlen) {
+  _getMultilineContents(lines, head, hval, hlen, tail, tlen, opts) {
     let operation = OP.NONE;
 
+    const applyEmptyLines = opts && opts.applyEmptyLines;
+
     return lines.map(l => {
-      if (l.length === 0) { return l; }
+      if (!applyEmptyLines && l.length === 0) {
+        return l;
+      }
 
       if (operation !== OP.ADDED &&
           (l.slice(0, hlen) === hval && tlen === 0 || l.slice(-tlen) === tail)) {
@@ -500,8 +508,15 @@ export default Ember.Component.extend({
         this.set('value', `${pre.slice(0, -hlen)}${sel.value}${post.slice(tlen)}`);
         this._selectText(sel.start - hlen, sel.value.length);
       } else {
-        const contents = this._getMultilineContents(lines, head, hval, hlen, tail, tlen);
-
+        const contents = this._getMultilineContents(
+          lines,
+          head,
+          hval,
+          hlen,
+          tail,
+          tlen,
+          opts
+        );
         this.set('value', `${pre}${contents}${post}`);
         if (lines.length === 1 && tlen > 0) {
           this._selectText(sel.start + hlen, sel.value.length);
@@ -512,9 +527,9 @@ export default Ember.Component.extend({
     }
   },
 
-  _applyList(sel, head, exampleKey) {
+  _applyList(sel, head, exampleKey, opts) {
     if (sel.value.indexOf("\n") !== -1) {
-      this._applySurround(sel, head, '', exampleKey);
+      this._applySurround(sel, head, '', exampleKey, opts);
     } else {
 
       const [hval, hlen] = getHead(head);
@@ -622,7 +637,7 @@ export default Ember.Component.extend({
         selected,
         selectText: (from, length) => this._selectText(from, length),
         applySurround: (head, tail, exampleKey, opts) => this._applySurround(selected, head, tail, exampleKey, opts),
-        applyList: (head, exampleKey) => this._applyList(selected, head, exampleKey),
+        applyList: (head, exampleKey, opts) => this._applyList(selected, head, exampleKey, opts),
         addText: text => this._addText(selected, text),
         replaceText: text => this._addText({pre: '', post: ''}, text),
         getText: () => this.get('value'),
diff --git a/test/javascripts/components/d-editor-test.js.es6 b/test/javascripts/components/d-editor-test.js.es6
index 9f9cbe22179..8bc3b0d09d8 100644
--- a/test/javascripts/components/d-editor-test.js.es6
+++ b/test/javascripts/components/d-editor-test.js.es6
@@ -514,6 +514,32 @@ third line`
 });
 
 
+componentTest("quote button - empty lines", {
+  template: '{{d-editor value=value composerEvents=true}}',
+  beforeEach() {
+    this.set('value', "one\n\ntwo\n\nthree");
+  },
+  test(assert) {
+    const textarea = jumpEnd(this.$('textarea.d-editor-input')[0]);
+
+    andThen(() => {
+      textarea.selectionStart = 0;
+    });
+
+    click('button.quote');
+    andThen(() => {
+      assert.equal(this.get('value'), "> one\n> \n> two\n> \n> three");
+      assert.equal(textarea.selectionStart, 0);
+      assert.equal(textarea.selectionEnd, 25);
+    });
+
+    click('button.quote');
+    andThen(() => {
+      assert.equal(this.get('value'), "one\n\ntwo\n\nthree");
+    });
+  }
+});
+
 testCase('quote button', function(assert, textarea) {
 
   andThen(() => {