1 files changed, 3 insertions, 1 deletions
diff --git a/server/sonar-docs/src/layouts/components/HeadingsLink.js b/server/sonar-docs/src/layouts/components/HeadingsLink.js
index 4d16c0027f7..a940422b4ac 100644
--- a/server/sonar-docs/src/layouts/components/HeadingsLink.js
+++ b/server/sonar-docs/src/layouts/components/HeadingsLink.js
@@ -39,6 +39,7 @@ export default class HeadingsLink extends React.Component {
 
   componentDidMount() {
     document.addEventListener('scroll', this.scrollHandler, true);
+    this.scrollHandler();
   }
 
   componentWillReceiveProps(nextProps) {
@@ -64,9 +65,10 @@ export default class HeadingsLink extends React.Component {
       }
       headingIndex = i;
     }
+    const scrollLimit = document.body.scrollHeight - document.body.clientHeight;
     this.setState({
       activeIndex: headingIndex,
-      marginTop: Math.max(MINIMUM_TOP_MARGIN, scrollTop)
+      marginTop: Math.max(MINIMUM_TOP_MARGIN, Math.min(scrollTop, scrollLimit))
     });
     this.markH2(headingIndex + 1, false);
   };