diff --git a/docs/_includes/nav-docs.html b/docs/_includes/nav-docs.html
index 6b3564cd9a..0e8431b506 100644
--- a/docs/_includes/nav-docs.html
+++ b/docs/_includes/nav-docs.html
@@ -28,7 +28,7 @@
           {% assign active = nil %}
 
           {% if page.url contains slug %}
-            {% assign active = 'active' %}
+            {% assign active = 'active bs-docs-sidenav-active' %}
           {% endif %}
 
           <li class="{{ active }}">
@@ -40,7 +40,7 @@
               <ul class="nav">
                 {% for section in doc.sections %}
                   <li>
-                    <a href="{{ site.baseurl }}/{{ group.title | downcase | replace: ' ', '-' }}/{{ doc.title | downcase | replace: ' ', '-' }}/#{{ section.title | downcase | replace: ' ', '-' }}">
+                    <a href="#{{ section.title | downcase | replace: ' ', '-' }}">
                       {{ section.title }}
                     </a>
                   </li>
diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html
index 89de0a2122..ecc5e74771 100644
--- a/docs/_layouts/default.html
+++ b/docs/_layouts/default.html
@@ -4,7 +4,7 @@
     <!-- Meta, title, CSS, favicons, etc. -->
     {% include header.html %}
   </head>
-  <body class="bs-docs" data-spy="scroll" data-target=".bs-docs-sidenav">
+  <body class="bs-docs" data-spy="scroll" data-target=".bs-docs-sidenav-active">
     <a id="skippy" class="sr-only sr-only-focusable" href="#content">
       <div class="container">
         <span class="skiplink-text">Skip to main content</span>
