diff --git a/src/root/topbar.tt b/src/root/topbar.tt
index 01c76f33..7ac4b43a 100644
--- a/src/root/topbar.tt
+++ b/src/root/topbar.tt
@@ -189,7 +189,7 @@
 <div class="pull-right">
 
   <form class="navbar-search" action="[% c.uri_for('/search') %]">
-    <input name="query" type="text" class="search-query span2" placeholder="Search"></input>
+    <input name="query" type="text" class="search-query span2" placeholder="Search" [% HTML.attributes(value => c.req.params.query) %]></input>
   </form>
 
   <ul class="nav" id="top-menu">