diff --git a/apps/frontend/src/components/ui/NavTabs.vue b/apps/frontend/src/components/ui/NavTabs.vue
index 5a2c0b78..d3114eeb 100644
--- a/apps/frontend/src/components/ui/NavTabs.vue
+++ b/apps/frontend/src/components/ui/NavTabs.vue
@@ -14,6 +14,7 @@
 				'text-button-textSelected': activeIndex === index && !subpageSelected,
 				'text-contrast': activeIndex === index && subpageSelected,
 			}"
+			@click="(e) => emit('click', e)"
 		>
 			<component :is="link.icon" v-if="link.icon" class="size-5" />
 			<span class="text-nowrap">{{ link.label }}</span>
@@ -38,6 +39,9 @@
 import { computed, onMounted, ref, watch } from 'vue'
 
 const route = useNativeRoute()
+const emit = defineEmits<{
+	(e: 'click', event: MouseEvent): void
+}>()
 
 interface Tab {
 	label: string
diff --git a/apps/frontend/src/pages/search/[searchProjectType].vue b/apps/frontend/src/pages/search/[searchProjectType].vue
index bd908801..ca8783c7 100644
--- a/apps/frontend/src/pages/search/[searchProjectType].vue
+++ b/apps/frontend/src/pages/search/[searchProjectType].vue
@@ -54,6 +54,7 @@
 				v-if="!server && !flags.projectTypesPrimaryNav"
 				:links="selectableProjectTypes"
 				class="hidden md:flex"
+				@click="query = ''"
 			/>
 		</section>
 		<aside
@@ -385,6 +386,9 @@ await updateServerContext()
 
 watch(route, () => {
 	updateServerContext()
+	if (!route.params.q) {
+		query.value = ''
+	}
 })
 
 async function updateServerContext() {