diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Detail/GameDetail.razor.cs b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Detail/GameDetail.razor.cs
index 9e28609..5e0d4f1 100644
--- a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Detail/GameDetail.razor.cs
+++ b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Detail/GameDetail.razor.cs
@@ -22,7 +22,7 @@ public partial class GameDetail : GameBaseComponent
 
     private void HandleSubmitNewGame()
     {
-        NavigationManager.NavigateTo("/");
+        NavigationManager.NavigateTo("/Games");
     }
 
     private async Task FetchGameDetail()
diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Filter/AdvancedGameFilter.razor b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Filter/AdvancedGameFilter.razor
index d0863d8..454cea8 100644
--- a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Filter/AdvancedGameFilter.razor
+++ b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Filter/AdvancedGameFilter.razor
@@ -4,6 +4,8 @@
 @using GameIdeas.BlazorApp.Shared.Constants
 @using GameIdeas.Shared.Dto
 
+<NavigationLock OnBeforeInternalNavigation="HandleLocationChanged" />
+
 <div class="advanced-filter-container" style="@(ExpandedFilter ? "display: flex" : "")">
     <span class="title">@ResourcesKey.Filters</span>
 
@@ -33,9 +35,9 @@
     <span class="title">@ResourcesKey.LastAdd</span>
 </div>
 
-<button type="button" class="open-filter" @onclick=HandleExpandFilter>
+<button type="button" class="open-filter" @onclick=HandleExpandFilterAsync>
     @Icons.Filter
 </button>
 
-<BackdropFilter @ref="BackdropFilter" OnClick="HandleBackdropFilterClicked" CloseOnClick="true"
+<BackdropFilter @ref="BackdropFilter" OnClick="HandleBackdropFilterClickedAsync" CloseOnClick="true"
                 AllowBodyScroll="false" Color="BackdropFilterColor.Overlay" />
diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Filter/AdvancedGameFilter.razor.cs b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Filter/AdvancedGameFilter.razor.cs
index a3ab225..b0ae8c2 100644
--- a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Filter/AdvancedGameFilter.razor.cs
+++ b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Filter/AdvancedGameFilter.razor.cs
@@ -4,6 +4,7 @@ using GameIdeas.BlazorApp.Shared.Components.Select.Models;
 using GameIdeas.Resources;
 using GameIdeas.Shared.Dto;
 using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components.Routing;
 
 namespace GameIdeas.BlazorApp.Pages.Games.Filter;
 
@@ -48,13 +49,26 @@ public partial class AdvancedGameFilter
 
         throw new ArgumentNullException(ResourcesKey.ErrorStorageSpaceLabel);
     }
-    private void HandleExpandFilter(Microsoft.AspNetCore.Components.Web.MouseEventArgs args)
+    private async Task HandleExpandFilterAsync(Microsoft.AspNetCore.Components.Web.MouseEventArgs args)
     {
         ExpandedFilter = true;
+        await ExpandedFilterChanged.InvokeAsync(ExpandedFilter);
         BackdropFilter?.Show();
     }
-    private void HandleBackdropFilterClicked()
+
+    private async Task HandleBackdropFilterClickedAsync()
     {
         ExpandedFilter = false;
+        await ExpandedFilterChanged.InvokeAsync(ExpandedFilter);
+    }
+
+    private void HandleLocationChanged(LocationChangingContext locationContext)
+    {
+        if (ExpandedFilter)
+        {
+            ExpandedFilter = false;
+            BackdropFilter?.Hide();
+            locationContext.PreventNavigation();
+        }
     }
 }
\ No newline at end of file
diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Games.razor b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Games.razor
index 4d87077..3adf599 100644
--- a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Games.razor
+++ b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Games.razor
@@ -1,4 +1,4 @@
-@page "/"
+@page "/Games"
 @using GameIdeas.BlazorApp.Pages.Games.Components
 @using GameIdeas.BlazorApp.Pages.Games.Filter
 @using GameIdeas.BlazorApp.Shared.Components
diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Redirect/RedirectToGames.razor b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Redirect/RedirectToGames.razor
new file mode 100644
index 0000000..f9a3eaf
--- /dev/null
+++ b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Redirect/RedirectToGames.razor
@@ -0,0 +1,10 @@
+@page "/"
+
+@inject NavigationManager navigationManager
+
+@code {
+    protected override void OnInitialized()
+    {
+        navigationManager.NavigateTo("/Games");
+    }
+}
diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/UserMenu/UserMenu.razor.cs b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/UserMenu/UserMenu.razor.cs
index 093b70e..b339592 100644
--- a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/UserMenu/UserMenu.razor.cs
+++ b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/UserMenu/UserMenu.razor.cs
@@ -14,7 +14,7 @@ public partial class UserMenu
     {
         ContentVisile = false;
         await AuthGateway.Logout();
-        NavigationManager.NavigateTo("/");
+        NavigationManager.NavigateTo("/Games");
     }
 
     private void HandleAccountClicked()