diff --git a/app/assets/javascripts/discourse/dialects/dialect.js b/app/assets/javascripts/discourse/dialects/dialect.js
index 68d3d0ac4b..a5ea056f90 100644
--- a/app/assets/javascripts/discourse/dialects/dialect.js
+++ b/app/assets/javascripts/discourse/dialects/dialect.js
@@ -321,7 +321,7 @@ Discourse.Dialect = {
 
         if (endFound !== -1) {
           if (trailingContents) {
-            next.unshift(MD.mk_block(trailingContents));
+            next.unshift(MD.mk_block(trailingContents.replace(/^\s+/, "")));
           }
 
           blockContents.push(leadingContents.replace(/\s+$/, ""));
@@ -332,8 +332,6 @@ Discourse.Dialect = {
       }
 
 
-
-
       var emitterResult = args.emitter.call(this, blockContents, m, dialect.options);
       if (emitterResult) {
         result.push(emitterResult);
diff --git a/test/javascripts/components/bbcode_test.js b/test/javascripts/components/bbcode_test.js
index a3b44951b5..f893d6a59f 100644
--- a/test/javascripts/components/bbcode_test.js
+++ b/test/javascripts/components/bbcode_test.js
@@ -95,4 +95,12 @@ test("quote formatting", function() {
 
 });
 
+test("quotes with trailing formatting", function() {
+  var cooked = Discourse.Markdown.cook("[quote=\"EvilTrout, post:123, topic:456, full:true\"]\nhello\n[/quote]\n*Test*", {lookupAvatar: false});
+  equal(cooked,
+        "<p><aside class=\"quote\" data-post=\"123\" data-topic=\"456\" data-full=\"true\"><div class=\"title\">" +
+        "<div class=\"quote-controls\"></div>EvilTrout said:</div><blockquote><p>hello</p></blockquote></aside></p>\n\n<p><em>Test</em></p>",
+        "it allows trailing formatting");
+});
+