From 6cb2af27a66be5c4dc6a218abca7eddcf0a9c570 Mon Sep 17 00:00:00 2001
From: "Calum H. (IMB11)" <contact@cal.engineer>
Date: Mon, 27 Jul 2026 15:58:41 +0100
Subject: [PATCH] fix: search resetting to page 1

---
 apps/app-frontend/src/pages/Browse.vue                   | 6 ++++--
 .../shared/browse-tab/composables/use-browse-search.ts   | 9 +++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/apps/app-frontend/src/pages/Browse.vue b/apps/app-frontend/src/pages/Browse.vue
index edd229c125..fed10c5d07 100644
--- a/apps/app-frontend/src/pages/Browse.vue
+++ b/apps/app-frontend/src/pages/Browse.vue
@@ -975,8 +975,10 @@ const searchState = useBrowseSearch({
 watch(
 	[
 		() => searchState.query.value,
-		() => searchState.currentFilters.value,
-		() => searchState.serverCurrentFilters.value,
+		() =>
+			searchState.isServerType.value
+				? searchState.serverCurrentFilters.value
+				: searchState.currentFilters.value,
 		() => projectType.value,
 	],
 	() => {
diff --git a/packages/ui/src/layouts/shared/browse-tab/composables/use-browse-search.ts b/packages/ui/src/layouts/shared/browse-tab/composables/use-browse-search.ts
index 4d8be25ecc..7481c073b2 100644
--- a/packages/ui/src/layouts/shared/browse-tab/composables/use-browse-search.ts
+++ b/packages/ui/src/layouts/shared/browse-tab/composables/use-browse-search.ts
@@ -194,16 +194,17 @@ export function useBrowseSearch(options: UseBrowseSearchOptions): BrowseSearchSt
 	}
 
 	const providedFiltersOrEmpty = computed(() => options.providedFilters?.value ?? [])
+	const effectiveCurrentFilters = computed(() =>
+		isServerType.value ? serverCurrentFilters.value : currentFilters.value,
+	)
 
 	watch(
 		[
 			query,
 			maxResults,
 			options.projectType,
-			currentSortType,
-			serverCurrentSortType,
-			currentFilters,
-			serverCurrentFilters,
+			effectiveCurrentSortType,
+			effectiveCurrentFilters,
 			overriddenProvidedFilterTypes,
 			providedFiltersOrEmpty,
 		],