diff --git a/res/search.js b/res/search.js
index 4cebbe4b5b1f71f1ff61e3144281721af50d6494..8afc883830de039be34d46eaa6490f60406b36e6 100644
--- a/res/search.js
+++ b/res/search.js
@@ -334,6 +334,7 @@ var search = function () {
         "query": $("#q").val(),
         "selected_history_entry": -1
     };
+    location.hash = state.query;
     load_search_overview(state.query, show_overview);
     add_to_history(state.query);
     update_history();
@@ -469,4 +470,8 @@ $("body").click(function (e) {
 
 $("nav").click(function (e) {
     e.stopPropagation();
-});
\ No newline at end of file
+});
+
+$("#q").val(location.hash.substr(1));
+if ($("#q").val())
+    search();
\ No newline at end of file