diff --git a/RpgRoller/Components/Pages/Workspace.razor.cs b/RpgRoller/Components/Pages/Workspace.razor.cs
index 0edd7b5..c9aef64 100644
--- a/RpgRoller/Components/Pages/Workspace.razor.cs
+++ b/RpgRoller/Components/Pages/Workspace.razor.cs
@@ -236,9 +236,13 @@ public partial class Workspace : IAsyncDisposable
         CurrentScreen = targetScreen;
         IsScreenMenuOpen = false;
         await PersistScreenPreferenceAsync(CurrentScreen);
+        await InvokeAsync(StateHasChanged);
 
         if (IsAdminScreen)
+        {
             await EnsureAdminUsersLoadedAsync();
+            await InvokeAsync(StateHasChanged);
+        }
     }
 
     private Task SwitchToPlayAsync()