diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index e76566ec64..8d1fdab11d 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -4,6 +4,7 @@
 {{ else }}
 {{ with (index (index .Site.Sections .Section) 0)  }}
 {{ .Page.Content }}
+{{ $.Scratch.Set "uniqueId" .Page.UniqueID }}
 {{ end }}
 {{ end }}
 {{ partial "footer.html" . }}
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 40bbb5f6e5..76d197f506 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -6,6 +6,7 @@
       </div>
     </div>
 
+    {{ if $.Site.Params.autoNav }}
     {{ $.Scratch.Set "_sectionpages" (slice) }}
     {{ if $.Site.Params.menu }}
       {{ range $sname := $.Site.Params.menu }}
@@ -26,11 +27,14 @@
         {{ $.Scratch.Add "_allpages" .Page }}
       {{ end }}
     {{ end }}
-    {{ $allpages := $.Scratch.Get "_allpages" }}
+    {{ end }}
 
     <div id="navigation">
+        {{ if $.Site.Params.autoNav }}
+        {{ $allpages := $.Scratch.Get "_allpages" }}
         {{ range $index, $element := $allpages }}
-          {{if eq $element.UniqueID $.UniqueID }}
+          {{ $uniqueid := ($.Scratch.Get "uniqueId" | default $.UniqueID ) }}
+          {{if eq $element.UniqueID $uniqueid }}
             {{ if not (isset $.Params "prev") }}
               {{ with index $allpages (sub $index 1) }}
                 <a class="nav nav-prev" href="{{ $.Site.BaseURL }}{{ .URL }}"> <i class="fa fa-chevron-left"></i></a>
@@ -43,6 +47,7 @@
             {{ end }}
           {{ end }}
         {{ end }}
+        {{ end }}
         {{ with .Params.prev }}<a class="nav nav-prev" href="{{ $.Site.BaseURL }}{{ . }}"> <i class="fa fa-chevron-left"></i></a>{{ end }}
         {{ with .Params.next }}<a class="nav nav-next" href="{{ $.Site.BaseURL }}{{ . }}" style="margin-right: 0px;"><i class="fa fa-chevron-right"></i></a>{{ end }}
     </div>