diff --git a/lib/search.rb b/lib/search.rb
index 2d14b4c99..c1267d8c0 100644
--- a/lib/search.rb
+++ b/lib/search.rb
@@ -255,7 +255,8 @@ class Search
                   .where("topics.archetype <> ?", Archetype.private_message)
 
       if @search_context.present? && @search_context.is_a?(Topic)
-        posts = posts.where("posts.raw ilike ?", "%#{@term}%")
+        posts = posts.joins('JOIN users u ON u.id = posts.user_id')
+        posts = posts.where("posts.raw  || ' ' || u.username || ' ' || u.name ilike ?", "%#{@term}%")
       else
         posts = posts.where("post_search_data.search_data @@ #{ts_query}")
       end