diff --git a/src/GitList/Controller/TreeController.php b/src/GitList/Controller/TreeController.php
index 384b537..6e88e05 100644
--- a/src/GitList/Controller/TreeController.php
+++ b/src/GitList/Controller/TreeController.php
@@ -65,6 +65,7 @@ class TreeController implements ControllerProviderInterface
                 'breadcrumbs'    => $breadcrumbs,
                 'branches'       => $repository->getBranches(),
                 'tags'           => $repository->getTags(),
+                'query'          => $query
             ));
         })->assert('repo', $app['util.routing']->getRepositoryRegex())
           ->assert('branch', $app['util.routing']->getBranchRegex())
diff --git a/views/layout_page.twig b/views/layout_page.twig
index 45665af..307fffb 100644
--- a/views/layout_page.twig
+++ b/views/layout_page.twig
@@ -8,11 +8,11 @@
             <div class="span12">
                 {% if page in ['commits', 'searchcommits'] %}
                 <form class="form-search pull-right" action="{{ app.request.basepath }}/{{repo}}/commits/{{branch}}/search" method="POST">
-                    <input type="text" name="query" class="input-medium search-query" placeholder="Search commits..." value="{{ query }}">
+                    <input type="text" name="query" class="input-medium search-query" placeholder="Search commits..." value="{{ query | default("") }}">
                 </form>
                 {% else %}
                 <form class="form-search pull-right" action="{{ app.request.basepath }}/{{repo}}/tree/{{branch}}/search" method="POST">
-                    <input type="text" name="query" class="input-medium search-query" placeholder="Search tree..." value="{{ query }}">
+                    <input type="text" name="query" class="input-medium search-query" placeholder="Search tree..." value="{{ query | default("") }}">
                 </form>
                 {% endif %}