diff --git a/BTCPayServer/Components/NotificationsDropdown/Default.cshtml b/BTCPayServer/Components/NotificationsDropdown/Default.cshtml
index 5b15fce75..a5bfd357c 100644
--- a/BTCPayServer/Components/NotificationsDropdown/Default.cshtml
+++ b/BTCPayServer/Components/NotificationsDropdown/Default.cshtml
@@ -25,7 +25,7 @@
                 </a>
             }
             <a class="dropdown-item text-secondary" asp-controller="Notifications" asp-action="Index">See All</a>
-            <form asp-controller="Notifications" asp-action="MarkAllAsSeen" asp-route-returnUrl="@Context.Request.GetDisplayUrl()" method="post">
+            <form asp-controller="Notifications" asp-action="MarkAllAsSeen" asp-route-returnUrl="@Context.Request.GetCurrentPathWithQueryString()" method="post">
                 <button class="dropdown-item text-secondary" type="submit"><i class="fa fa-eye"></i> Mark all as seen</button>
             </form>
         </div>
diff --git a/BTCPayServer/Extensions.cs b/BTCPayServer/Extensions.cs
index 9896c2240..d161dbefc 100644
--- a/BTCPayServer/Extensions.cs
+++ b/BTCPayServer/Extensions.cs
@@ -298,6 +298,10 @@ namespace BTCPayServer
                         request.PathBase.ToUriComponent(),
                         request.Path.ToUriComponent());
         }
+        public static string GetCurrentPathWithQueryString(this HttpRequest request)
+        {
+            return request.PathBase + request.Path + request.QueryString;
+        }
 
         /// <summary>
         /// If 'toto' and RootPath is 'rootpath' returns '/rootpath/toto'