diff --git a/lib/redmine/acts/mentionable.rb b/lib/redmine/acts/mentionable.rb
index c7b0c0655..35659661f 100644
--- a/lib/redmine/acts/mentionable.rb
+++ b/lib/redmine/acts/mentionable.rb
@@ -103,7 +103,9 @@ module Redmine
             \s|
             \]|
             <|
-            $)
+            [[:punct:]]?
+            $
+          )
         /ix
       end
     end