diff --git a/templates/layouts/main.html.ep b/templates/layouts/main.html.ep
index 590ce85..062a6b3 100644
--- a/templates/layouts/main.html.ep
+++ b/templates/layouts/main.html.ep
@@ -76,7 +76,10 @@
     </noscript>
     
     <main<% if (stash 'main_class') { %> class="<%= stash 'main_class' %>"<% } %>>
-    %= content
+
+      %= include 'query'
+
+      %= content
     </main>
 
     % unless ($embedded) {
diff --git a/templates/search.html.ep b/templates/search.html.ep
index d91195f..58a8f38 100644
--- a/templates/search.html.ep
+++ b/templates/search.html.ep
@@ -24,8 +24,6 @@
 </p>
 </div>
 
-%= include 'query'
-
 <div id="search">
 % if (stash('results')->size && stash('total_results') != 0) {
   <ol class="align-left">