diff --git a/build_pages.py b/build_pages.py
index 3b9b864..87b1eb7 100755
--- a/build_pages.py
+++ b/build_pages.py
@@ -29,7 +29,8 @@ def main():
             content=page_content,
             extra_styles=f'<link rel="stylesheet" href="/styles/{page["style"]}.css">' if page['style'] else '',
             lang="sr",
-            sr_link=f"/en/{page['name']}"
+            sr_link=f"/en/{page['name']}",
+            current_path=f"/{page['name']}" if page['name'] != 'index' else "/"
         )
         
         sr_filename = "index.html" if page['name'] == 'index' else f"{page['name']}.html"
@@ -46,7 +47,8 @@ def main():
             content=page_content,
             extra_styles=f'<link rel="stylesheet" href="/styles/{page["style"]}.css">' if page['style'] else '',
             lang="en",
-            sr_link=f"/{page['name']}"
+            sr_link=f"/{page['name']}",
+            current_path=f"/en/{page['name']}" if page['name'] != 'index' else "/en/"
         )
         
         en_filename = "index.html" if page['name'] == 'index' else f"{page['name']}.html"
diff --git a/site/deconference.html b/site/deconference.html
index 41e18e6..7ec389b 100644
--- a/site/deconference.html
+++ b/site/deconference.html
@@ -50,7 +50,7 @@
         <img src="/img/logo-light.svg" alt="Logo" /> Decentrala
       </a>
       <button id="theme-switcher"></button>
-      <a class="lang" hreflang="en" href="/en/index">EN</a>
+      <a class="lang" hreflang="en" href="/en/deconference">EN</a>
     </header>
     <main>
       
diff --git a/template/base.html b/template/base.html
index fc41fb1..3120f1d 100644
--- a/template/base.html
+++ b/template/base.html
@@ -50,7 +50,7 @@
         <img src="/img/logo-{{ 'dark' if is_dark else 'light' }}.svg" alt="Logo" /> Decentrala
       </a>
       <button id="theme-switcher"></button>
-      <a class="lang" hreflang="{{ 'sr' if lang == 'en' else 'en' }}" href="{{ '/en/' if lang == 'sr' else '/' }}{{ 'index' if lang == 'sr' else '' }}{{ 'index' if lang == 'en' else '' }}">{{ 'SR' if lang == 'en' else 'EN' }}</a>
+      <a class="lang" hreflang="{{ 'sr' if lang == 'en' else 'en' }}" href="{{ current_path.replace('/en/', '/') if lang == 'en' else ('/en' + current_path if not current_path.startswith('/en/') else current_path) }}">{{ 'SR' if lang == 'en' else 'EN' }}</a>
     </header>
     <main>
       {% block content %}{% endblock %}