diff --git a/data/interfaces/default/searchresults.html b/data/interfaces/default/searchresults.html
index 737aac70..81737326 100644
--- a/data/interfaces/default/searchresults.html
+++ b/data/interfaces/default/searchresults.html
@@ -125,4 +125,18 @@
             initThisPage();
     	});
 	</script>
+
+    <script type="text/javascript">
+        <%!
+            # Abuse JSON module for escaping JavaScript
+            import json
+        %>
+        $(document).ready(function() {
+            // Search parameter
+            $("#searchbar input[name=name]").val(${name | json.dumps});
+
+            // Album or artist
+            $("#searchbar select[name=type]").val(${type | json.dumps});
+        });
+    </script>
 </%def>
diff --git a/headphones/webserve.py b/headphones/webserve.py
index be08c309..988f3a2d 100644
--- a/headphones/webserve.py
+++ b/headphones/webserve.py
@@ -142,7 +142,7 @@ class WebInterface(object):
             searchresults = mb.findArtist(name, limit=100)
         else:
             searchresults = mb.findRelease(name, limit=100)
-        return serve_template(templatename="searchresults.html", title='Search Results for: "' + name + '"', searchresults=searchresults, type=type)
+        return serve_template(templatename="searchresults.html", title='Search Results for: "' + name + '"', searchresults=searchresults, name=name, type=type)
     search.exposed = True
 
     def addArtist(self, artistid):