diff --git a/src/invidious.cr b/src/invidious.cr
index 835cffc78..b560fcb90 100644
--- a/src/invidious.cr
+++ b/src/invidious.cr
@@ -903,6 +903,7 @@ get "/search" do |env|
     count, videos = search(search_query, page, search_params, region).as(Tuple)
   end
 
+  env.set "search", query
   templated "search"
 end
 
@@ -3070,6 +3071,7 @@ get "/channel/:ucid/playlists" do |env|
   items = items.map { |item| item.as(SearchPlaylist) }
   items.each { |item| item.author = "" }
 
+  env.set "search", "channel:#{channel.ucid} "
   templated "playlists"
 end
 
@@ -3110,6 +3112,7 @@ get "/channel/:ucid/community" do |env|
     error_message = ex.message
   end
 
+  env.set "search", "channel:#{channel.ucid} "
   templated "community"
 end
 
diff --git a/src/invidious/views/template.ecr b/src/invidious/views/template.ecr
index 0d8c99249..6272d2be7 100644
--- a/src/invidious/views/template.ecr
+++ b/src/invidious/views/template.ecr
@@ -35,7 +35,7 @@
                 <div class="pure-u-1 pure-u-md-12-24 searchbar">
                     <form class="pure-form" action="/search" method="get">
                         <fieldset>
-                            <input type="search" style="width:100%" name="q" placeholder="<%= translate(locale, "search") %>" value="<%= env.get?("search").try {|x| HTML.escape(x.as(String)) } || env.params.query["q"]?.try {|x| HTML.escape(x)} %>">
+                            <input type="search" style="width:100%" name="q" placeholder="<%= translate(locale, "search") %>" value="<%= env.get?("search").try {|x| HTML.escape(x.as(String)) } %>">
                         </fieldset>
                     </form>
                 </div>