diff --git a/app/assets/javascripts/discourse/dialects/dialect.js b/app/assets/javascripts/discourse/dialects/dialect.js
index 495d0fa672..67f7cb8cc9 100644
--- a/app/assets/javascripts/discourse/dialects/dialect.js
+++ b/app/assets/javascripts/discourse/dialects/dialect.js
@@ -288,7 +288,7 @@ Discourse.Dialect = {
     this.registerInline(start, function(text, match, prev) {
       if (invalidBoundary(args, prev)) { return; }
 
-      var endPos = self.findEndPos(text, stop, args, startLength);
+      var endPos = self.findEndPos(text, start, stop, args, startLength);
       if (endPos === -1) { return; }
       var between = text.slice(startLength, endPos);
 
@@ -304,13 +304,14 @@ Discourse.Dialect = {
     });
   },
 
-  findEndPos: function(text, stop, args, start) {
-    var endPos = text.indexOf(stop, start);
-    if (endPos === -1) { return -1; }
-    var after = text.charAt(endPos + stop.length);
-    if (after && after.indexOf(stop) === 0) {
-      return this.findEndPos(text, stop, args, endPos + stop.length + 1);
-    }
+  findEndPos: function(text, start, stop, args, offset) {
+    var endPos, nextStart;
+    do {
+      endPos = text.indexOf(stop, offset);
+      if (endPos === -1) { return -1; }
+      nextStart = text.indexOf(start, offset);
+      offset = endPos + stop.length;
+    } while (nextStart !== -1 && nextStart < endPos);
     return endPos;
   },
 
diff --git a/test/javascripts/lib/bbcode_test.js b/test/javascripts/lib/bbcode_test.js
index 7d630a16b8..c269cff453 100644
--- a/test/javascripts/lib/bbcode_test.js
+++ b/test/javascripts/lib/bbcode_test.js
@@ -22,6 +22,7 @@ test('basic bbcode', function() {
          "<span class=\"bbcode-b\">evil <span class=\"bbcode-i\">trout</span></span>",
          "allows embedding of tags");
   format("[EMAIL]eviltrout@mailinator.com[/EMAIL]", "<a href=\"mailto:eviltrout@mailinator.com\">eviltrout@mailinator.com</a>", "supports upper case bbcode");
+  format("[b]strong [b]stronger[/b][/b]", "<span class=\"bbcode-b\">strong <span class=\"bbcode-b\">stronger</span></span>", "accepts nested bbcode tags");
 });
 
 test('invalid bbcode', function() {