diff --git a/server/server.go b/server/server.go
index e8dffe62a..4e1302df7 100644
--- a/server/server.go
+++ b/server/server.go
@@ -67,6 +67,10 @@ func (s *server) loadTemplates() {
 	}
 }
 
+func (s *server) ServeFastSearch(ctx context.Context, w http.ResponseWriter, r *http.Request) {
+	http.Redirect(w, r, "/search/?q=" + r.URL.Query().Get(":query"), 303)
+}
+
 func (s *server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	s.inner.ServeHTTP(w, r)
 }
@@ -555,6 +559,7 @@ func New(cfg *config.Config) (http.Handler, error) {
 
 	m.Add("GET", "/api/v1/search/:backend", srv.Handler(srv.ServeAPISearch))
 	m.Add("GET", "/api/v1/search/", srv.Handler(srv.ServeAPISearch))
+  m.Add("GET", "/:query/", srv.Handler(srv.ServeFastSearch))
 
 	var h http.Handler = m