From f5ad4df28ad2b2ec471c965e22568357d9cc6254 Mon Sep 17 00:00:00 2001
From: nicktrn <55853254+nicktrn@users.noreply.github.com>
Date: Wed, 29 Apr 2026 12:27:01 +0100
Subject: [PATCH] fix(webapp): preserve filters on queues page action redirects

---
 .server-changes/queues-preserve-filters-on-action.md        | 6 ++++++
 .../route.tsx                                               | 4 +---
 2 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 .server-changes/queues-preserve-filters-on-action.md

diff --git a/.server-changes/queues-preserve-filters-on-action.md b/.server-changes/queues-preserve-filters-on-action.md
new file mode 100644
index 00000000000..c472d35a123
--- /dev/null
+++ b/.server-changes/queues-preserve-filters-on-action.md
@@ -0,0 +1,6 @@
+---
+area: webapp
+type: fix
+---
+
+Preserve filters on the queues page when submitting modal actions.
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.queues/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.queues/route.tsx
index b33fc1e809b..fdc0c505aec 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.queues/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.queues/route.tsx
@@ -176,9 +176,7 @@ export const action = async ({ request, params }: ActionFunctionArgs) => {
   const action = formData.get("action");
 
   const url = new URL(request.url);
-  const { page } = SearchParamsSchema.parse(Object.fromEntries(url.searchParams));
-
-  const redirectPath = `/orgs/${organizationSlug}/projects/${projectParam}/env/${envParam}/queues?page=${page}`;
+  const redirectPath = `/orgs/${organizationSlug}/projects/${projectParam}/env/${envParam}/queues${url.search}`;
 
   if (environment.archivedAt) {
     return redirectWithErrorMessage(redirectPath, request, "This branch is archived");