diff --git a/keep-notes/lib/i18n/LanguageProvider.tsx b/keep-notes/lib/i18n/LanguageProvider.tsx
index cdb8f65..b19d1c2 100644
--- a/keep-notes/lib/i18n/LanguageProvider.tsx
+++ b/keep-notes/lib/i18n/LanguageProvider.tsx
@@ -35,6 +35,16 @@ export function LanguageProvider({ children, initialLanguage = 'en' }: {
     if (saved) {
       setLanguageState(saved)
       document.documentElement.lang = saved
+    } else {
+      // Auto-detect from browser language
+      const browserLang = navigator.language.split('-')[0] as SupportedLanguage
+      const supportedLangs: SupportedLanguage[] = ['en', 'fr', 'es', 'de', 'fa', 'it', 'pt', 'ru', 'zh', 'ja', 'ko', 'ar', 'hi', 'nl', 'pl']
+
+      if (supportedLangs.includes(browserLang)) {
+        setLanguageState(browserLang)
+        localStorage.setItem('user-language', browserLang)
+        document.documentElement.lang = browserLang
+      }
     }
   }, [])