diff --git a/ui-repolist.c b/ui-repolist.c
index 2b55181..4b16b6e 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -108,7 +108,7 @@ static int is_in_url(struct cgit_repo *repo)
 static void print_sort_header(const char *title, const char *sort)
 {
 	html("<th class='left'><a href='");
-	html_attr(cgit_rooturl());
+	html_attr(ctx.qry.url);
 	htmlf("?s=%s", sort);
 	if (ctx.qry.search) {
 		html("&amp;q=");
@@ -315,7 +315,7 @@ void cgit_print_repolist()
 				cgit_close_filter(ctx.repo->owner_filter);
 			} else {
 				html("<a href='");
-				html_attr(cgit_rooturl());
+				html_attr(ctx.qry.url);
 				html("?q=");
 				html_url_arg(ctx.repo->owner);
 				html("'>");
diff --git a/ui-shared.c b/ui-shared.c
index 1a84afc..21e163c 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -952,7 +952,7 @@ void cgit_print_pageheader(void)
 				  NULL, NULL, 0);
 		html("</td><td class='form'>");
 		html("<form method='get' action='");
-		html_attr(cgit_rooturl());
+		html_attr(ctx.qry.url);
 		html("'>\n");
 		html("<input type='text' name='q' size='10' value='");
 		html_attr(ctx.qry.search);