diff --git a/cps/templates/layout.html b/cps/templates/layout.html
index 559eeabc1..d486e1036 100644
--- a/cps/templates/layout.html
+++ b/cps/templates/layout.html
@@ -42,7 +42,7 @@
           <form class="navbar-form navbar-left" role="search" action="{{url_for('web.search')}}" method="GET">
             <div class="form-group input-group input-group-sm">
               <label for="query" class="sr-only">{{_('Search')}}</label>
-              <input type="text" class="form-control" id="query" name="query" placeholder="{{_('Search Library')}}">
+              <input type="text" class="form-control" id="query" name="query" placeholder="{{_('Search Library')}}" value="{{searchterm}}">
               <span class="input-group-btn">
                 <button type="submit" id="query_submit" class="btn btn-default">{{_('Search')}}</button>
               </span>
@@ -224,6 +224,11 @@
             $("#btn-upload").change(function() {
                 $("#form-upload").submit();
             });
+            $(document).ready(function() {
+              var inp = $('#query').first()
+              var val = inp.val()
+              inp.val('').blur().focus().val(val)
+            });
         });
     </script>
     {% block js %}{% endblock %}
diff --git a/cps/templates/search.html b/cps/templates/search.html
index 07f3a42b4..c67e77bb2 100644
--- a/cps/templates/search.html
+++ b/cps/templates/search.html
@@ -2,10 +2,10 @@
 {% block body %}
 <div class="discover">
     {% if entries|length < 1 %}
-      <h2>{{_('No Results Found')}} {{searchterm}}</h2>
-      <p>{{_('Search Term:')}} {{searchterm}}</p>
+      <h2>{{_('No Results Found')}} {{adv_searchterm}}</h2>
+      <p>{{_('Search Term:')}} {{adv_searchterm}}</p>
     {% else %}
-      <h2>{{entries|length}} {{_('Results for:')}} {{searchterm}}</h2>
+      <h2>{{entries|length}} {{_('Results for:')}} {{adv_searchterm}}</h2>
       {% if g.user.is_authenticated %}
         {% if g.user.shelf.all() or g.shelves_access %}
           <div id="shelf-actions" class="btn-toolbar" role="toolbar">
diff --git a/cps/web.py b/cps/web.py
index c99cfeb9f..a5af8cb8d 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -893,9 +893,17 @@ def search():
         for element in entries:
             ids.append(element.id)
         searched_ids[current_user.id] = ids
-        return render_title_template('search.html', searchterm=term, entries=entries, title=_(u"Search"), page="search")
+        return render_title_template('search.html',
+                                     searchterm=term,
+                                     adv_searchterm=term,
+                                     entries=entries,
+                                     title=_(u"Search"),
+                                     page="search")
     else:
-        return render_title_template('search.html', searchterm="", title=_(u"Search"), page="search")
+        return render_title_template('search.html',
+                                     searchterm="",
+                                     title=_(u"Search"),
+                                     page="search")
 
 
 @web.route("/advanced_search", methods=['GET'])
@@ -1033,7 +1041,7 @@ def advanced_search():
         for element in q:
             ids.append(element.id)
         searched_ids[current_user.id] = ids
-        return render_title_template('search.html', searchterm=searchterm,
+        return render_title_template('search.html', adv_searchterm=searchterm,
                                      entries=q, title=_(u"search"), page="search")
     # prepare data for search-form
     tags = db.session.query(db.Tags).join(db.books_tags_link).join(db.Books).filter(common_filters()) \