diff --git a/src/Humans.Infrastructure/Services/ShiftSignupService.cs b/src/Humans.Infrastructure/Services/ShiftSignupService.cs
index 3cb19c93d..098386894 100644
--- a/src/Humans.Infrastructure/Services/ShiftSignupService.cs
+++ b/src/Humans.Infrastructure/Services/ShiftSignupService.cs
@@ -992,7 +992,7 @@ await _notificationService.SendAsync(
                 $"Coverage gap: {shift.Rota.Name} day {shift.DayOffset}",
                 coordinatorIds,
                 body: $"Only {confirmedCount}/{shift.MinVolunteers} volunteers confirmed.",
-                actionUrl: $"/Shifts?departmentId={teamId}",
+                actionUrl: $"/Shifts/Dashboard?departmentId={teamId}",
                 actionLabel: "Find cover \u2192");
         }
         catch (Exception ex)
@@ -1037,7 +1037,7 @@ await _notificationService.SendAsync(
                 $"Shift signup change: {rotaName}",
                 coordinatorIds,
                 body: enrichedDescription,
-                actionUrl: $"/Shifts?departmentId={teamId}",
+                actionUrl: $"/Shifts/Dashboard?departmentId={teamId}",
                 actionLabel: "View \u2192");
         }
         catch (Exception ex)
diff --git a/src/Humans.Web/Controllers/ShiftsController.cs b/src/Humans.Web/Controllers/ShiftsController.cs
index f46c3216d..28a500365 100644
--- a/src/Humans.Web/Controllers/ShiftsController.cs
+++ b/src/Humans.Web/Controllers/ShiftsController.cs
@@ -188,7 +188,7 @@ public async Task<IActionResult> Index(Guid? departmentId, string? fromDate, str
 
     [HttpPost("SignUp")]
     [ValidateAntiForgeryToken]
-    public async Task<IActionResult> SignUp(Guid shiftId)
+    public async Task<IActionResult> SignUp(Guid shiftId, Guid? departmentId, string? fromDate, string? toDate, string? period, [FromForm(Name = "tags")] List<Guid>? tagIds)
     {
         var (currentUserNotFound, user) = await ResolveCurrentUserOrChallengeAsync();
         if (currentUserNotFound is not null)
@@ -202,19 +202,19 @@ public async Task<IActionResult> SignUp(Guid shiftId)
         if (!result.Success)
         {
             SetError(result.Error ?? "Shift signup failed.");
-            return RedirectToAction(nameof(Index));
+            return RedirectToAction(nameof(Index), BuildFilterRouteValues(departmentId, fromDate, toDate, period, tagIds));
         }
 
         SetSuccess(result.Warning is not null
             ? $"Signed up successfully. Note: {result.Warning}"
             : "Signed up successfully!");
 
-        return RedirectToAction(nameof(Index));
+        return RedirectToAction(nameof(Index), BuildFilterRouteValues(departmentId, fromDate, toDate, period, tagIds));
     }
 
     [HttpPost("SignUpRange")]
     [ValidateAntiForgeryToken]
-    public async Task<IActionResult> SignUpRange(Guid rotaId, int startDayOffset, int endDayOffset)
+    public async Task<IActionResult> SignUpRange(Guid rotaId, int startDayOffset, int endDayOffset, Guid? departmentId, string? fromDate, string? toDate, string? period, [FromForm(Name = "tags")] List<Guid>? tagIds)
     {
         var (currentUserNotFound, user) = await ResolveCurrentUserOrChallengeAsync();
         if (currentUserNotFound is not null)
@@ -228,14 +228,27 @@ public async Task<IActionResult> SignUpRange(Guid rotaId, int startDayOffset, in
         if (!result.Success)
         {
             SetError(result.Error ?? "Shift range signup failed.");
-            return RedirectToAction(nameof(Index));
+            return RedirectToAction(nameof(Index), BuildFilterRouteValues(departmentId, fromDate, toDate, period, tagIds));
         }
 
         SetSuccess(result.Warning is not null
             ? $"Signed up for date range. Note: {result.Warning}"
             : "Signed up for date range!");
 
-        return RedirectToAction(nameof(Index));
+        return RedirectToAction(nameof(Index), BuildFilterRouteValues(departmentId, fromDate, toDate, period, tagIds));
+    }
+
+    private static RouteValueDictionary BuildFilterRouteValues(Guid? departmentId, string? fromDate, string? toDate, string? period, List<Guid>? tagIds)
+    {
+        var rv = new RouteValueDictionary();
+        if (departmentId.HasValue) rv["departmentId"] = departmentId.Value;
+        if (!string.IsNullOrEmpty(fromDate)) rv["fromDate"] = fromDate;
+        if (!string.IsNullOrEmpty(toDate)) rv["toDate"] = toDate;
+        if (!string.IsNullOrEmpty(period)) rv["period"] = period;
+        if (tagIds is { Count: > 0 })
+            for (var i = 0; i < tagIds.Count; i++)
+                rv[$"tags[{i}]"] = tagIds[i];
+        return rv;
     }
 
     [HttpPost("BailRange")]
diff --git a/src/Humans.Web/Views/Shifts/Index.cshtml b/src/Humans.Web/Views/Shifts/Index.cshtml
index 83755c5ed..6f14ca31d 100644
--- a/src/Humans.Web/Views/Shifts/Index.cshtml
+++ b/src/Humans.Web/Views/Shifts/Index.cshtml
@@ -280,6 +280,11 @@
                                 <form asp-action="SignUpRange" method="post" class="row g-2 align-items-end mb-3">
                                     @Html.AntiForgeryToken()
                                     <input type="hidden" name="rotaId" value="@rotaGroup.Rota.Id" />
+                                    @if (Model.FilterDepartmentId.HasValue) { <input type="hidden" name="departmentId" value="@Model.FilterDepartmentId" /> }
+                                    @if (!string.IsNullOrEmpty(Model.FilterFromDate)) { <input type="hidden" name="fromDate" value="@Model.FilterFromDate" /> }
+                                    @if (!string.IsNullOrEmpty(Model.FilterToDate)) { <input type="hidden" name="toDate" value="@Model.FilterToDate" /> }
+                                    @if (!string.IsNullOrEmpty(Model.FilterPeriod)) { <input type="hidden" name="period" value="@Model.FilterPeriod" /> }
+                                    @foreach (var tagId in Model.FilterTagIds) { <input type="hidden" name="tags" value="@tagId" /> }
                                     <div class="col-auto">
                                         <label class="form-label form-label-sm">Start</label>
                                         <select name="startDayOffset" class="form-select form-select-sm">
@@ -544,6 +549,11 @@
                                                         <form asp-action="SignUp" method="post" class="d-inline">
                                                             @Html.AntiForgeryToken()
                                                             <input type="hidden" name="shiftId" value="@shift.Id" />
+                                                            @if (Model.FilterDepartmentId.HasValue) { <input type="hidden" name="departmentId" value="@Model.FilterDepartmentId" /> }
+                                                            @if (!string.IsNullOrEmpty(Model.FilterFromDate)) { <input type="hidden" name="fromDate" value="@Model.FilterFromDate" /> }
+                                                            @if (!string.IsNullOrEmpty(Model.FilterToDate)) { <input type="hidden" name="toDate" value="@Model.FilterToDate" /> }
+                                                            @if (!string.IsNullOrEmpty(Model.FilterPeriod)) { <input type="hidden" name="period" value="@Model.FilterPeriod" /> }
+                                                            @foreach (var tagId in Model.FilterTagIds) { <input type="hidden" name="tags" value="@tagId" /> }
                                                             <button type="submit" class="btn btn-sm btn-success">Sign Up</button>
                                                         </form>
                                                     }