diff --git a/docs/js/custom.js b/docs/js/custom.js
index 332f657d9a..d5f0f23d6e 100644
--- a/docs/js/custom.js
+++ b/docs/js/custom.js
@@ -18,19 +18,20 @@ $(document).ready(function() {
         warningBox.hidden = false;
     }
 
-    $('.md-content a.md-icon').each(function() {
+    if (!/^\d+\.\d+$/.test(branchName) && branchName !== 'latest') {
+        branchName = 'master';
+    }
+
+    // Insert version into header links
+    $('.md-header a.md-logo, #site-name > a').each(function() {
         $(this).attr(
             'href',
             $(this)
                 .attr('href')
-                .replace('master/docs/', branchName + '/docs/'),
+                .replace(/\/en\/[^\/]+\//, '/en/' + branchName + '/'),
         );
     });
 
-    if (!/^\d+\.\d+$/.test(branchName) && branchName !== 'latest') {
-        branchName = 'master';
-    }
-
     // Add version pill to top of navigation
     $('#site-name').append('<span class="pill">' + branchName + '</span>');
 
diff --git a/theme/main.html b/theme/main.html
index 41784bb459..f4daa26b2c 100644
--- a/theme/main.html
+++ b/theme/main.html
@@ -19,7 +19,11 @@
       <div class="main_nav">
         <div class="main_nav_content">
           <div class="site-header" id="site-name">
-            <a href="/">{{ config.site_name }}</a>
+            {% set site_url = config.site_url | default(nav.homepage.url, true) | url %}
+            {% if not config.use_directory_urls and site_url[0] == site_url[-1] == "." %}
+              {% set site_url = site_url ~ "/index.html" %}
+            {% endif %}
+            <a href="{{ site_url }}">{{ config.site_name }}</a>
           </div>
           <div class="md-sidebar md-sidebar--primary" data-md-component="navigation">
             <div class="md-sidebar__scrollwrap">