diff --git a/public/js/docs-app.js b/public/js/docs-app.js
index d8e3c169..b4ccfa2d 100644
--- a/public/js/docs-app.js
+++ b/public/js/docs-app.js
@@ -242,12 +242,19 @@ if (typeof window !== 'undefined') {
     // Remember current document slug before reloading list
     const currentSlug = currentDocument ? currentDocument.slug : null;
 
+    // Update URL lang parameter BEFORE reloading documents
+    // This ensures detectLanguage() reads the correct language from URL
+    if (currentSlug) {
+      updateURL(currentSlug, newLang);
+    }
+
     // Reload document list to show translated category labels and document titles
     await loadDocuments();
 
-    // Reload current document in new language if one was loaded
+    // Explicitly reload current document to ensure it updates
+    // (loadDocuments auto-loads from URL, but explicit call ensures it happens)
     if (currentSlug) {
-      loadDocument(currentSlug, newLang);
+      await loadDocument(currentSlug, newLang);
     }
   });