diff --git a/layouts/docs/second.html b/layouts/docs/second.html
index 834b23839..c2639c7bf 100644
--- a/layouts/docs/second.html
+++ b/layouts/docs/second.html
@@ -147,9 +147,7 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
                     </div>
                 </div>
 
-                {{ if .IsPage }}
                 {{ partial "pagination" . }}
-                {{ end }}
                 
                 <div></div>
             </div>
diff --git a/layouts/docs/single.html b/layouts/docs/single.html
index dfd1e5a01..514bcd1bd 100644
--- a/layouts/docs/single.html
+++ b/layouts/docs/single.html
@@ -155,9 +155,7 @@
                         </div>
                     </div>
 
-                    {{ if .IsPage }}
                     {{ partial "pagination" . }}
-                    {{ end }}
                     
                     <div></div>
                 </div>
diff --git a/layouts/partials/pagination.html b/layouts/partials/pagination.html
index 6fe3074bd..6fa6d459c 100644
--- a/layouts/partials/pagination.html
+++ b/layouts/partials/pagination.html
@@ -1,6 +1,7 @@
 <div class="page-div common-flex-layout">
+{{ if .IsPage }}
 	<!-- if not each page in a section is pure page we can't simply use prev/nextInsection -->
-	<!-- or is there a better way -->
+	<!-- todo!!! is there a better way to solve this ? -->
 	{{ $current := .}}
 	{{ $p := .Parent.Pages.ByWeight }}
 	{{ $length := len $p }}
@@ -29,5 +30,20 @@
 	{{ else }}
 	{{ partial "page_navigation" (dict "context" . "prev" false)}}
 	{{ end }}
+{{ else }}
+	<!-- index prev -->
+	{{ partial "page_navigation" (dict "context" . "prev" true)}}
 
+	<!-- index next -->
+	{{ $pages:= .Pages.ByWeight}}
+	{{ if gt $pages 0}}
+	{{ with (index $pages 0)}}
+	<a class="next" href="{{.RelPermalink}}">
+		{{ i18n "Next" }}
+		<span>: {{.LinkTitle}}</span>
+		<img src="/images/docs/v3.3/next.svg" alt="{{ i18n " Next" }}">
+	</a>
+	{{ end }}
+	{{ end }}
+{{ end }}
 </div>
\ No newline at end of file