diff --git a/resources/content_server/browse/browse.js b/resources/content_server/browse/browse.js
index 1fb4cf4f70..6783f83a1d 100644
--- a/resources/content_server/browse/browse.js
+++ b/resources/content_server/browse/browse.js
@@ -285,6 +285,15 @@ function booklist(hide_sort) {
     first_page(); 
 }
 
+function search_result() {
+    var test = $("#booklist #page0").html();
+    if (!test) {
+        $("#booklist").html("No books found matching this query");
+        return;
+    }
+    booklist();
+}
+
 function show_details(a_dom) {
     var book = $(a_dom).closest('div.summary');
     var bd = $('#book_details_dialog');
diff --git a/src/calibre/library/server/browse.py b/src/calibre/library/server/browse.py
index fd9e568163..5b7d732820 100644
--- a/src/calibre/library/server/browse.py
+++ b/src/calibre/library/server/browse.py
@@ -873,7 +873,7 @@ class BrowseServer(object):
                 suffix=_('in search')+': '+xml(query))
         return self.browse_template(sort, category=False, initial_search=query).format(
                 title=_('Matching books'),
-                script='booklist();', main=html)
+                script='search_result();', main=html)
 
     # }}}