diff --git a/app/assets/javascripts/discourse/dialects/quote_dialect.js b/app/assets/javascripts/discourse/dialects/quote_dialect.js
index abf228990e..dfccfd013d 100644
--- a/app/assets/javascripts/discourse/dialects/quote_dialect.js
+++ b/app/assets/javascripts/discourse/dialects/quote_dialect.js
@@ -38,6 +38,11 @@ Discourse.Dialect.replaceBlock({
     var contents = ['blockquote'];
     if (blockContents.length) {
       var self = this;
+
+      if (blockContents && (typeof blockContents[0] === "string")) {
+        blockContents[0] = blockContents[0].replace(/^[\s]*/, '');
+      }
+
       blockContents.forEach(function (bc) {
         var processed = self.processInline(bc);
         if (processed.length) {
diff --git a/test/javascripts/lib/bbcode_test.js b/test/javascripts/lib/bbcode_test.js
index 64ef9ec5ff..91bce2ac0d 100644
--- a/test/javascripts/lib/bbcode_test.js
+++ b/test/javascripts/lib/bbcode_test.js
@@ -91,6 +91,10 @@ test("quotes", function() {
          "<aside class=\"quote\"><blockquote><p>test</p></blockquote></aside>",
          "it supports quotes without params");
 
+  format("[quote]\n*test*\n[/quote]",
+         "<aside class=\"quote\"><blockquote><p><em>test</em></p></blockquote></aside>",
+         "it doesn't insert a new line for italics");
+
 });
 
 test("quote formatting", function() {