diff --git a/public/js/editorpreviews.js b/public/js/editorpreviews.js
index 27b8324..6f51f81 100644
--- a/public/js/editorpreviews.js
+++ b/public/js/editorpreviews.js
@@ -22,7 +22,7 @@ WebAssembly.instantiateStreaming(fetch('../parsing.wasm'), go.importObject)
     });
 
 const doPreview = () => {
-    if (!ready || !inputData) {
+    if (!ready || inputData === null) {
         return;
     }
 
diff --git a/public/parsing.wasm b/public/parsing.wasm
old mode 100644
new mode 100755
index 49be7c4..8f2949d
Binary files a/public/parsing.wasm and b/public/parsing.wasm differ
diff --git a/src/parsing/bbcode.go b/src/parsing/bbcode.go
index 2d68e28..30b2b87 100644
--- a/src/parsing/bbcode.go
+++ b/src/parsing/bbcode.go
@@ -23,7 +23,8 @@ import (
 
 var BBCodePriority = 1 // TODO: This is maybe too high a priority?
 
-var reTag = regexp.MustCompile(`(?P<open>\[\s*(?P<opentagname>[a-zA-Z0-9]+))|(?P<close>\[\s*\/\s*(?P<closetagname>[a-zA-Z0-9]+)\s*\])`)
+var reOpenTag = regexp.MustCompile(`^\[\s*(?P<name>[a-zA-Z0-9]+)`)
+var reTag = regexp.MustCompile(`\[\s*(?P<opentagname>[a-zA-Z0-9]+)|\[\s*\/\s*(?P<closetagname>[a-zA-Z0-9]+)\s*\]`)
 
 var previewBBCodeCompiler = bbcode.NewCompiler(false, false)
 var realBBCodeCompiler = bbcode.NewCompiler(false, false)
@@ -245,38 +246,42 @@ func (s bbcodeParser) Parse(parent gast.Node, block text.Reader, pc parser.Conte
 	_, pos := block.Position()
 	restOfSource := block.Source()[pos.Start:]
 
-	matches := reTag.FindAllSubmatchIndex(restOfSource, -1)
-	if matches == nil {
-		// No tags anywhere
+	openMatch := reOpenTag.FindSubmatch(restOfSource)
+	if openMatch == nil {
+		// not a bbcode tag
 		return nil
 	}
 
 	otIndex := reTag.SubexpIndex("opentagname")
 	ctIndex := reTag.SubexpIndex("closetagname")
 
-	tagName := extractStringBySubmatchIndices(restOfSource, matches[0], otIndex)
-	if tagName == "" {
-		// Not an opening tag
-		return nil
-	}
-
+	tagName := string(openMatch[reOpenTag.SubexpIndex("name")])
 	depth := 0
 	endIndex := -1
-	for _, m := range matches {
-		if openName := extractStringBySubmatchIndices(restOfSource, m, otIndex); openName != "" {
-			if openName == tagName {
-				depth++
-			}
-		} else if closeName := extractStringBySubmatchIndices(restOfSource, m, ctIndex); closeName != "" {
-			if closeName == tagName {
-				depth--
-				if depth == 0 {
-					// We have balanced out!
-					endIndex = m[1] // the end index of this closing tag (exclusive)
-					break
-				}
+
+	searchStartIndex := 0
+
+	for {
+		searchText := restOfSource[searchStartIndex:]
+
+		match := reTag.FindSubmatchIndex(searchText)
+		if match == nil {
+			// no more tags
+			break
+		}
+
+		if openName := extractStringBySubmatchIndices(searchText, match, otIndex); openName == tagName {
+			depth++
+		} else if closeName := extractStringBySubmatchIndices(searchText, match, ctIndex); closeName == tagName {
+			depth--
+			if depth == 0 {
+				// We have balanced out!
+				endIndex = searchStartIndex + match[1] // the end index of this closing tag (exclusive)
+				break
 			}
 		}
+
+		searchStartIndex = searchStartIndex + match[1]
 	}
 	if endIndex < 0 {
 		// Unbalanced, too many opening tags
diff --git a/src/parsing/parsing_test.go b/src/parsing/parsing_test.go
index a56212f..cd2a611 100644
--- a/src/parsing/parsing_test.go
+++ b/src/parsing/parsing_test.go
@@ -63,6 +63,26 @@ func main() {
 	})
 }
 
+func TestSharlock(t *testing.T) {
+	t.Skipf("This doesn't pass right now because parts of Sharlock's original source read as indented code blocks, or depend on different line break behavior.")
+	t.Run("sanity check", func(t *testing.T) {
+		result := ParsePostInput(sharlock, RealMarkdown)
+
+		for _, line := range strings.Split(result, "\n") {
+			assert.NotContains(t, line, "[b]")
+			assert.NotContains(t, line, "[/b]")
+			assert.NotContains(t, line, "[ul]")
+			assert.NotContains(t, line, "[/ul]")
+			assert.NotContains(t, line, "[li]")
+			assert.NotContains(t, line, "[/li]")
+			assert.NotContains(t, line, "[img]")
+			assert.NotContains(t, line, "[/img]")
+			assert.NotContains(t, line, "[code")
+			assert.NotContains(t, line, "[/code]")
+		}
+	})
+}
+
 func BenchmarkSharlock(b *testing.B) {
 	for i := 0; i < b.N; i++ {
 		ParsePostInput(sharlock, RealMarkdown)
diff --git a/src/parsing/wasm/build.sh b/src/parsing/wasm/build.sh
old mode 100644
new mode 100755