diff --git a/lib/search_entries.rb b/lib/search_entries.rb
index ba17e254..96c1dd52 100644
--- a/lib/search_entries.rb
+++ b/lib/search_entries.rb
@@ -56,7 +56,8 @@ module SearchEntries
         end
 
       [sql, number, number.length > 1 ? number.delete_prefix('0') : number, keyword]
-    elsif keyword.match?(/[^\p{L}\d&@.-]/) || keyword.match?(/\A['"].*['"]\z/) || keyword.match?(/[.-]{2,}/)
+    elsif keyword.start_with?('@') || keyword.match?(/[^\p{L}\d&@.-]/) ||
+          keyword.match?(/\A['"].*['"]\z/) || keyword.match?(/[.-]{2,}/)
       ['tsvector @@ plainto_tsquery(?)', TextUtils.transliterate(keyword.downcase)]
     else
       keyword = TextUtils.transliterate(keyword.downcase).squish