diff --git a/ircfmt/ircfmt.go b/ircfmt/ircfmt.go
index e18c57b..e525056 100644
--- a/ircfmt/ircfmt.go
+++ b/ircfmt/ircfmt.go
@@ -102,7 +102,7 @@ var (
 		"default":     "99",
 	}
 
-	bracketedExpr = regexp.MustCompile(`^\[.*\]`)
+	bracketedExpr = regexp.MustCompile(`^\[.*?\]`)
 	colourDigits  = regexp.MustCompile(`^[0-9]{1,2}$`)
 )
 
diff --git a/ircfmt/ircfmt_test.go b/ircfmt/ircfmt_test.go
index e73732f..133caa6 100644
--- a/ircfmt/ircfmt_test.go
+++ b/ircfmt/ircfmt_test.go
@@ -38,6 +38,7 @@ var unescapetests = []testcase{
 	{"te$c[04,03]9st", "te\x0304,039st"},
 	{"te$c[asdf   !23a fd4*#]st", "te\x03st"},
 	{"te$c[asdf  , !2,3a fd4*#]st", "te\x03st"},
+	{"Client opered up $c[grey][$r%s$c[grey], $r%s$c[grey]]", "Client opered up \x0314[\x0f%s\x0314, \x0f%s\x0314]"},
 }
 
 var stripTests = []testcase{