diff --git a/damus/Models/Mentions.swift b/damus/Models/Mentions.swift
index ba1904fa..9d8ea5a0 100644
--- a/damus/Models/Mentions.swift
+++ b/damus/Models/Mentions.swift
@@ -415,7 +415,7 @@ func parse_while(_ p: Parser, match: (Character) -> Bool) -> String? {
 }
 
 func is_hashtag_char(_ c: Character) -> Bool {
-    return c.isLetter || c.isNumber
+    return (c.isLetter || c.isNumber || c.isASCII) && (!c.isPunctuation && !c.isWhitespace)
 }
 
 func prev_char(_ p: Parser, n: Int) -> Character? {