diff --git a/Moonlight.Frontend/UI/Admin/Views/Sys/Index.razor b/Moonlight.Frontend/UI/Admin/Views/Sys/Index.razor
index 9a4b9998..f1c42b9f 100644
--- a/Moonlight.Frontend/UI/Admin/Views/Sys/Index.razor
+++ b/Moonlight.Frontend/UI/Admin/Views/Sys/Index.razor
@@ -1,4 +1,5 @@
 @page "/admin/system"
+
 @using LucideBlazor
 @using ShadcnBlazor.Buttons
 @using ShadcnBlazor.Cards
@@ -6,7 +7,9 @@
 @using ShadcnBlazor.Tab
 @using ShadcnBlazor.Labels
 
-<Tabs DefaultValue="customization">
+@inject NavigationManager Navigation
+
+<Tabs DefaultValue="@(Tab ?? "customization")" OnValueChanged="OnTabChanged">
     <TabsList ClassName="inline-flex w-full lg:w-fit justify-start overflow-x-auto overflow-y-hidden">
         <TabsTrigger Value="customization">
             <PaintRollerIcon />
@@ -42,4 +45,16 @@
     <TabsContent Value="diagnose">
         <Diagnose />
     </TabsContent>
-</Tabs>
\ No newline at end of file
+</Tabs>
+
+@code
+{
+    [SupplyParameterFromQuery(Name = "tab")]
+    [Parameter]
+    public string? Tab { get; set; }
+
+    private void OnTabChanged(string name)
+    {
+        Navigation.NavigateTo($"/admin/system?tab={name}");
+    }
+}
\ No newline at end of file