diff --git a/app/assets/javascripts/discourse/dialects/autolink_dialect.js b/app/assets/javascripts/discourse/dialects/autolink_dialect.js
index 897ca40744f..086e41d674b 100644
--- a/app/assets/javascripts/discourse/dialects/autolink_dialect.js
+++ b/app/assets/javascripts/discourse/dialects/autolink_dialect.js
@@ -49,6 +49,7 @@ Discourse.Dialect.on("register", function(event) {
 
       if (remaining && remaining.match(/\n/)) {
         next.unshift(MD.mk_block(remaining));
+        remaining = [];
       }
     }
 
diff --git a/test/javascripts/components/markdown_test.js b/test/javascripts/components/markdown_test.js
index cce57a4412a..b272d4e4d9b 100644
--- a/test/javascripts/components/markdown_test.js
+++ b/test/javascripts/components/markdown_test.js
@@ -62,6 +62,10 @@ test("Links", function() {
          '<p>EvilTrout: <a href="http://eviltrout.com">http://eviltrout.com</a></p>',
          "autolinks a URL");
 
+  cooked("EvilTrout: http://eviltrout.com hello",
+         '<p>EvilTrout: <a href="http://eviltrout.com">http://eviltrout.com</a> hello</p>',
+         "autolinks with trailing text");
+
   cooked("here is [an example](http://twitter.com)",
          '<p>here is <a href="http://twitter.com">an example</a></p>',
          "supports markdown style links");