diff --git a/web/templates.go b/web/templates.go
index 4574e4741..e5aa2ced0 100644
--- a/web/templates.go
+++ b/web/templates.go
@@ -213,7 +213,7 @@ document.onkeydown=function(e){
 <title>Results for {{.QueryStr}}</title>
 <script>
   function zoektAddQ(atom) {
-      window.location.href = "/search?q=" + escape("{{.QueryStr}}" + " " + atom) +
+      window.location.href = "/search?q=" + encodeURIComponent("{{.QueryStr}}" + " " + atom) +
 	  "&" + "num=" + {{.Last.Num}};
   }
 </script>