diff --git a/src/matchers.js b/src/matchers.js
index e0f24cb2..fc937073 100644
--- a/src/matchers.js
+++ b/src/matchers.js
@@ -20,7 +20,7 @@ export class MentionMatcher extends Matcher {
 	}
 
 	match( string ) {
-		return this.doMatch( string, /@(\w+)/, matches => ( { username: matches[1] } ) );
+		return this.doMatch( string, /@([\w-]+)/, matches => ( { username: matches[1] } ) );
 	}
 }