diff --git a/src/invidious/routes/channels.cr b/src/invidious/routes/channels.cr
index d3969d297..16621994f 100644
--- a/src/invidious/routes/channels.cr
+++ b/src/invidious/routes/channels.cr
@@ -278,6 +278,7 @@ module Invidious::Routes::Channels
       return error_template(500, ex)
     end
 
+    env.set "search", "channel:#{ucid} "
     return {locale, user, subscriptions, continuation, ucid, channel}
   end
 end
diff --git a/src/invidious/routes/search.cr b/src/invidious/routes/search.cr
index 2a9705cf3..6c3088dee 100644
--- a/src/invidious/routes/search.cr
+++ b/src/invidious/routes/search.cr
@@ -65,7 +65,11 @@ module Invidious::Routes::Search
 
       redirect_url = Invidious::Frontend::Misc.redirect_url(env)
 
-      env.set "search", query.text
+      if query.type == Invidious::Search::Query::Type::Channel
+        env.set "search", "channel:#{query.channel} #{query.text}"
+      else
+        env.set "search", query.text
+      end
       templated "search"
     end
   end