diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Components/GameCreationForm.razor.cs b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Components/GameCreationForm.razor.cs
index 1e773d9..358d442 100644
--- a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Components/GameCreationForm.razor.cs
+++ b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Components/GameCreationForm.razor.cs
@@ -16,6 +16,7 @@ public partial class GameCreationForm
     [Inject] private IGameGateway GameGateway { get; set; } = default!;
     [CascadingParameter] private Popup? Popup { get; set; }
     [Parameter] public CategoriesDto? Categories { get; set; }
+    [Parameter] public EventCallback OnSubmit { get; set; }
 
     private GameDto GameDto = new();
     private EditContext? EditContext;
@@ -57,6 +58,7 @@ public partial class GameCreationForm
             if (gameId != 0)
             {
                 Popup?.Close();
+                await OnSubmit.InvokeAsync();
             }
         }
         catch (Exception)
diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/GameBase.razor b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/GameBase.razor
index 404ea88..f06eaeb 100644
--- a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/GameBase.razor
+++ b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/GameBase.razor
@@ -25,5 +25,5 @@
 </div>
 
 <Popup @ref=ManualAddPopup BackdropFilterClicked="HandleBackdropManualAddClicked" Closable=false>
-    <GameCreationForm Categories="Categories" />
+    <GameCreationForm Categories="Categories" OnSubmit="HandleFetchCategories" />
 </Popup>
diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/GameBase.razor.cs b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/GameBase.razor.cs
index f00fdd0..e356f4a 100644
--- a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/GameBase.razor.cs
+++ b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/GameBase.razor.cs
@@ -17,7 +17,7 @@ public partial class GameBase ()
 
     protected override async Task OnInitializedAsync()
     {
-        Categories = await GameGateway.FetchCategories();
+        await HandleFetchCategories();
         await base.OnInitializedAsync();
     }
     private void HandleAddClicked(AddType addType)
@@ -37,4 +37,8 @@ public partial class GameBase ()
     {
         ManualAddPopup?.Close();
     }
+    private async Task HandleFetchCategories()
+    {
+        Categories = await GameGateway.FetchCategories();
+    }
 }
\ No newline at end of file