diff --git a/appview/pages/templates/fragments/tabSelector.html b/appview/pages/templates/fragments/tabSelector.html
--- a/appview/pages/templates/fragments/tabSelector.html
+++ b/appview/pages/templates/fragments/tabSelector.html
@@ -2,12 +2,20 @@ {{ define "fragments/tabSelector" }}
   {{ $name := .Name }}
   {{ $all := .Values }}
   {{ $active := .Active }}
+  {{ $include := .Include }}
   <div class="flex justify-between divide-x divide-gray-200 dark:divide-gray-700 rounded border border-gray-200 dark:border-gray-700 overflow-hidden">
     {{ $activeTab := "bg-white dark:bg-gray-700 shadow-sm" }}
     {{ $inactiveTab := "bg-gray-100 dark:bg-gray-800 shadow-inner" }}
     {{ range $index, $value := $all }}
       {{ $isActive := eq $value.Key $active }}
       <a href="?{{ $name }}={{ $value.Key }}"
+         {{ if $include }}
+         hx-get="?{{ $name }}={{ $value.Key }}"
+         hx-include="{{ $include }}"
+         hx-push-url="true"
+         hx-target="body"
+         hx-on:htmx:config-request="if(!event.detail.parameters.q) delete event.detail.parameters.q"
+         {{ end }}
          class="p-2 whitespace-nowrap flex justify-center items-center gap-2 text-sm w-full block hover:no-underline text-center {{ if $isActive }} {{$activeTab }} {{ else }} {{ $inactiveTab }} {{ end }}">
        {{ if $value.Icon }}
          {{ i $value.Icon "size-4" }}
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
@@ -32,6 +32,7 @@ <form class="flex relative col-span-3 sm:col-span-1 sm:col-start-2" method="GET">
       <input type="hidden" name="state" value="{{ if .FilteringByOpen }}open{{ else }}closed{{ end }}">
       <div class="flex-1 flex relative">
         <input
+          id="search-q"
           class="flex-1 py-1 pl-2 pr-10 mr-[-1px] rounded-r-none focus:border-0 focus:outline-none focus:ring focus:ring-blue-400 ring-inset peer"
           type="text"
           name="q"
@@ -53,7 +54,7 @@ {{ i "search" "w-4 h-4" }}
       </button>
     </form>
     <div class="sm:row-start-1">
-      {{ template "fragments/tabSelector" (dict "Name" "state" "Values" $values "Active" $active) }}
+      {{ template "fragments/tabSelector" (dict "Name" "state" "Values" $values "Active" $active "Include" "#search-q") }}
     </div>
     <a
       href="/{{ .RepoInfo.FullName }}/issues/new"
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
@@ -38,6 +38,7 @@ <form class="flex relative col-span-3 sm:col-span-1 sm:col-start-2" method="GET">
       <input type="hidden" name="state" value="{{ .FilteringBy.String }}">
       <div class="flex-1 flex relative">
         <input
+          id="search-q"
           class="flex-1 py-1 pl-2 pr-10 mr-[-1px] rounded-r-none focus:border-0 focus:outline-none focus:ring focus:ring-blue-400 ring-inset peer"
           type="text"
           name="q"
@@ -59,7 +60,7 @@ {{ i "search" "w-4 h-4" }}
       </button>
     </form>
     <div class="sm:row-start-1">
-      {{ template "fragments/tabSelector" (dict "Name" "state" "Values" $values "Active" $active) }}
+      {{ template "fragments/tabSelector" (dict "Name" "state" "Values" $values "Active" $active "Include" "#search-q") }}
     </div>
     <a
       href="/{{ .RepoInfo.FullName }}/pulls/new"