diff --git a/_includes/inner-page-main-content.html b/_includes/inner-page-main-content.html
index 78a954b5ae..ba5f15e916 100644
--- a/_includes/inner-page-main-content.html
+++ b/_includes/inner-page-main-content.html
@@ -2,7 +2,9 @@
 	<div class="wrap">
 		<div class="content-primary">
 			<div class="inner-box">
-				{{content}}
+				<div class="toc-context">
+					{{content}}
+				</div>
 
 				{% include contributors-list.html %}
 			</div>
diff --git a/_layouts/cheatsheet.html b/_layouts/cheatsheet.html
index 471a120c4f..1a560b4e3a 100644
--- a/_layouts/cheatsheet.html
+++ b/_layouts/cheatsheet.html
@@ -6,7 +6,10 @@
 	<div class="wrap">
 		<div class="content-primary cheatsheet">
 			<div class="inner-box">
-				{{content}}
+				<div class="toc-context">
+					{{content}}
+				</div>
+
         {% if page.languages %}
           <ul id="available-languages" style="display: none;">
             <li><a href="{{site.baseurl}}{{ page.url }}">English</a></li>
diff --git a/_layouts/glossary.html b/_layouts/glossary.html
index e65a189e23..62b50b0a39 100644
--- a/_layouts/glossary.html
+++ b/_layouts/glossary.html
@@ -7,7 +7,9 @@
 	<div class="wrap">
 		<div class="content-primary documentation glossary">
 			<div class="inner-box">
-				{{content}}
+				<div class="toc-context">
+					{{content}}
+				</div>
 
 				{% include contributors-list.html %}
 			</div>
diff --git a/_layouts/inner-page.html b/_layouts/inner-page.html
index 30d6366101..e0cc813293 100644
--- a/_layouts/inner-page.html
+++ b/_layouts/inner-page.html
@@ -5,7 +5,7 @@
 <section class="full-width">
 	<div class="wrap">
 		<div class="content-primary">
-			<div class="inner-box">
+			<div class="inner-box toc-context">
 				{{content}}
 			</div>
 		</div>
diff --git a/_layouts/multipage-overview.html b/_layouts/multipage-overview.html
index a98e6742e3..3bdcb2afc2 100644
--- a/_layouts/multipage-overview.html
+++ b/_layouts/multipage-overview.html
@@ -8,7 +8,9 @@
 	<div class="wrap">
 		<div class="content-primary documentation">
 			<div class="inner-box">
-				{{content}}
+				<div class="toc-context">
+					{{content}}
+				</div>
 
 				{% include contributors-list.html %}
 			</div>
diff --git a/_layouts/overviews.html b/_layouts/overviews.html
index 888ffc2061..2dd5aa06d9 100644
--- a/_layouts/overviews.html
+++ b/_layouts/overviews.html
@@ -5,7 +5,7 @@
 <section class="full-width">
 	<div class="wrap">
 		<div class="content-primary overviews">
-			<div class="inner-box">
+			<div class="inner-box toc-context">
 				{{content}}
 			</div>
 		</div>
diff --git a/_layouts/singlepage-overview.html b/_layouts/singlepage-overview.html
index 72cabad3fd..08e67dde8e 100644
--- a/_layouts/singlepage-overview.html
+++ b/_layouts/singlepage-overview.html
@@ -7,7 +7,9 @@
 	<div class="wrap">
 		<div class="content-primary documentation">
 			<div class="inner-box">
-				{{content}}
+				<div class="toc-context">
+					{{content}}
+				</div>
 
 				{% include contributors-list.html %}
 			</div>
diff --git a/_layouts/sip.html b/_layouts/sip.html
index 0805943f08..9537c472fe 100644
--- a/_layouts/sip.html
+++ b/_layouts/sip.html
@@ -6,7 +6,7 @@
 <section class="content">
 	<div class="wrap">
 		<div class="content-primary documentation">
-			<div class="inner-box">
+			<div class="inner-box toc-context">
 				{{content}}
 			</div>
 		</div>
diff --git a/_layouts/sips.html b/_layouts/sips.html
index ea2b40b2db..2bb7843cf0 100644
--- a/_layouts/sips.html
+++ b/_layouts/sips.html
@@ -5,7 +5,7 @@
 <section class="content">
 	<div class="wrap">
 		<div class="content-primary sips">
-			<div class="inner-box">
+			<div class="inner-box toc-context">
 				{{content}}
 			</div>
 		</div>
diff --git a/_layouts/style-guide.html b/_layouts/style-guide.html
index ecc9a53bf2..b5e7741522 100644
--- a/_layouts/style-guide.html
+++ b/_layouts/style-guide.html
@@ -8,7 +8,9 @@
 	<div class="wrap">
 		<div class="content-primary documentation style-guide">
 			<div class="inner-box">
-				{{content}}
+				<div class="toc-context">
+					{{content}}
+				</div>
 
 				{% include contributors-list.html %}
 			</div>
diff --git a/_layouts/tour.html b/_layouts/tour.html
index 9369547dd7..ce65fd5098 100644
--- a/_layouts/tour.html
+++ b/_layouts/tour.html
@@ -8,7 +8,9 @@
 	<div class="wrap">
 		<div class="content-primary documentation">
 			<div class="inner-box">
-				{{content}}
+                <div class="toc-context">
+                    {{content}}
+                </div>
 
                 <div class="two-columns">
                     {% if page.previous-page %}
diff --git a/resources/js/functions.js b/resources/js/functions.js
index ed94b16a9f..ff9d0f7676 100644
--- a/resources/js/functions.js
+++ b/resources/js/functions.js
@@ -300,13 +300,13 @@ $(document).ready(function() {
   if ($("#sidebar-toc").length) {
     $('#toc').toc({
       exclude: 'h1, h5, h6',
-      context: '.inner-box',
+      context: '.toc-context',
       autoId: true,
       numerate: false
     });
     toggleStickyToc();
   }
-})
+});
 
 $(window).resize(function() {
   toggleStickyToc();