diff --git a/app/assets/javascripts/discourse/dialects/mention_dialect.js b/app/assets/javascripts/discourse/dialects/mention_dialect.js
index 3dbaf834d8..554c6fe13d 100644
--- a/app/assets/javascripts/discourse/dialects/mention_dialect.js
+++ b/app/assets/javascripts/discourse/dialects/mention_dialect.js
@@ -58,6 +58,9 @@ Discourse.Dialect.on("register", function(event) {
           remaining = remaining.slice(nextMention);
           this.processInline(before).forEach(pushIt);
           continue;
+        } else {
+          before = before + remaining;
+          remaining = "";
         }
 
       } else {
diff --git a/test/javascripts/components/markdown_test.js b/test/javascripts/components/markdown_test.js
index cec2812aae..6d900d18c5 100644
--- a/test/javascripts/components/markdown_test.js
+++ b/test/javascripts/components/markdown_test.js
@@ -148,6 +148,10 @@ test("Mentions", function() {
          "<p>Yes <code>@this</code> should be code <span class=\"mention\">@eviltrout</span></p>",
          "Does not mention in an inline code block");
 
+  cooked("@eviltrout and `@eviltrout`",
+         "<p><span class=\"mention\">@eviltrout</span> and <code>@eviltrout</code></p>",
+         "you can have a mention in an inline code block following a real mention.");
+
 });
 
 test("Oneboxing", function() {