diff --git a/ts/admin.ts b/ts/admin.ts
index c73044b..41fdc14 100644
--- a/ts/admin.ts
+++ b/ts/admin.ts
@@ -105,9 +105,14 @@ document.addEventListener("tab-change", (event: CustomEvent) => {
     if (lang) {
         tab += "?lang=" + lang
     }
-    window.history.replaceState("", "Admin - jfa-go", tab);
+    window.history.pushState(event.detail, "Admin - jfa-go", tab);
 });
 
+window.onpopstate = (event: PopStateEvent) => {
+    console.log(event.state);
+    window.tabs.switch(event.state);
+}
+
 function login(username: string, password: string, run?: (state?: number) => void) {
     const req = new XMLHttpRequest();
     req.responseType = 'json';