diff --git a/appview/pages/templates/fragments/pagination.html b/appview/pages/templates/fragments/pagination.html
--- a/appview/pages/templates/fragments/pagination.html
+++ b/appview/pages/templates/fragments/pagination.html
@@ -1,9 +1,9 @@
 {{ define "fragments/pagination" }}
-  {{/* Params: Page (pagination.Page), TotalCount (int), BasePath (string), QueryParams (string) */}}
+  {{/* Params: Page (pagination.Page), TotalCount (int), BasePath (string), QueryParams (url.Values) */}}
   {{ $page := .Page }}
   {{ $totalCount := .TotalCount }}
   {{ $basePath := .BasePath }}
-  {{ $queryParams := .QueryParams }}
+  {{ $queryParams := safeUrl .QueryParams.Encode }}
 
   {{ $prev := $page.Previous.Offset }}
   {{ $next := $page.Next.Offset }}
diff --git a/appview/pages/templates/repo/issues/issues.html b/appview/pages/templates/repo/issues/issues.html
--- a/appview/pages/templates/repo/issues/issues.html
+++ b/appview/pages/templates/repo/issues/issues.html
@@ -80,7 +80,7 @@ {{ template "fragments/pagination" (dict
         "Page" .Page 
         "TotalCount" .IssueCount 
         "BasePath" (printf "/%s/issues" .RepoInfo.FullName)
-        "QueryParams" (printf "state=%s&q=%s" $state .FilterQuery)
+        "QueryParams" (queryParams "state" $state "q" .FilterQuery)
     ) }}
   {{ end }}
 {{ end }}
diff --git a/appview/pages/templates/repo/pulls/pulls.html b/appview/pages/templates/repo/pulls/pulls.html
--- a/appview/pages/templates/repo/pulls/pulls.html
+++ b/appview/pages/templates/repo/pulls/pulls.html
@@ -166,7 +166,7 @@ {{ template "fragments/pagination" (dict
           "Page" .Page 
           "TotalCount" .PullCount 
           "BasePath" (printf "/%s/pulls" .RepoInfo.FullName)
-          "QueryParams" (printf "state=%s&q=%s" .FilteringBy.String .FilterQuery)
+          "QueryParams" (queryParams "state" .FilteringBy.String "q" .FilterQuery)
       ) }}
     {{ end }}
 {{ end }}