diff --git a/irc/strings.go b/irc/strings.go
index 6c496f95..a977190e 100644
--- a/irc/strings.go
+++ b/irc/strings.go
@@ -222,6 +222,7 @@ func realSkeleton(name string) (string, error) {
 // Shivaram@good-fortune -> *!shivaram@good-fortune
 // EDMUND -> edmund!*@*
 func CanonicalizeMaskWildcard(userhost string) (expanded string, err error) {
+	userhost = strings.TrimSpace(userhost)
 	var nick, user, host string
 	bangIndex := strings.IndexByte(userhost, '!')
 	strudelIndex := strings.IndexByte(userhost, '@')
diff --git a/irc/strings_test.go b/irc/strings_test.go
index 44f368af..1ffc1500 100644
--- a/irc/strings_test.go
+++ b/irc/strings_test.go
@@ -215,6 +215,7 @@ func TestCanonicalizeMaskWildcard(t *testing.T) {
 	tester("shivaram*", "shivaram*!*@*", nil)
 	tester("Shivaram*", "shivaram*!*@*", nil)
 	tester("*SHIVARAM*", "*shivaram*!*@*", nil)
+	tester("*SHIVARAM*   ", "*shivaram*!*@*", nil)
 }
 
 func validFoldTester(first, second string, equal bool, folder func(string) (string, error), t *testing.T) {