diff --git a/_includes/sidebar-toc-multipage-overview.html b/_includes/sidebar-toc-multipage-overview.html
index cf614c8da0..4f9d7cb75c 100644
--- a/_includes/sidebar-toc-multipage-overview.html
+++ b/_includes/sidebar-toc-multipage-overview.html
@@ -1,6 +1,6 @@
 {% assign pagetype = page.type %}
 <div class="content-nav">
-  <div class="inner-box sidebar-toc-wrapper {% if pagetype %}book{% endif %}" style="">
+  <div class="inner-box sidebar-toc-wrapper" style="">
     <h5 class="contents">Contents</h5>
       {% if pagetype %}
         <div class="inner-toc book" id="sidebar-toc">
diff --git a/_sass/layout/toc.scss b/_sass/layout/toc.scss
index e4e284bd64..22d9ada330 100644
--- a/_sass/layout/toc.scss
+++ b/_sass/layout/toc.scss
@@ -15,11 +15,6 @@
     display: none;
   }
 
-  // disable floating for the book, since the TOC can become very large
-  &.book {
-    position: relative;
-  }
-
   .contents {
     font-weight: 700;
   }
@@ -28,14 +23,11 @@
 .inner-toc {
   max-height: 60vh;
   overflow-y: auto;
+  position: relative;
 
   @include bp(large) {
     max-height: none;
   }
-
-  &.book {
-    max-height: none;
-  }
 }
 
 #toc {
diff --git a/resources/js/functions.js b/resources/js/functions.js
index 322652b95a..ccbf9753ac 100644
--- a/resources/js/functions.js
+++ b/resources/js/functions.js
@@ -282,6 +282,11 @@ $(document).ready(function() {
       autoId: true,
       numerate: false
     });
+    const target = $('#sidebar-toc .active');
+    if (target.length) {
+      const marginTop = $('#sidebar-toc .type-chapter').length ? 15 : 10;
+      $('#sidebar-toc').animate({scrollTop: target.position().top - marginTop}, 200);
+    };
   }
 });