diff --git a/themes/mytheme/layouts/_default/single.html b/themes/mytheme/layouts/_default/single.html
index 42a9062..b9baa26 100644
--- a/themes/mytheme/layouts/_default/single.html
+++ b/themes/mytheme/layouts/_default/single.html
@@ -36,9 +36,11 @@
       <li><a href="{{ .Permalink }}">{{ .LinkTitle }}</a></li>
       {{- end }}
     </ul>
-    {{- if (.Param "ShowPostNavLinks") }}
-    {{- partial "post_nav_links.html" . }}
-    {{- end }}
+    <nav class="paginav">
+      <a href="/" onclick="window.history()">
+        Go Back
+      </a>
+    </nav>
     <br/>
     {{- if (and (and site.Params.ShowShareButtons (ne .Params.disableShare true)) false) }}
     {{- partial "share_icons.html" . -}}
diff --git a/themes/mytheme/layouts/partials/post_nav_links.html b/themes/mytheme/layouts/partials/post_nav_links.html
index 5b00922..b988641 100644
--- a/themes/mytheme/layouts/partials/post_nav_links.html
+++ b/themes/mytheme/layouts/partials/post_nav_links.html
@@ -1,6 +1,19 @@
 {{- $pages := where site.RegularPages "Type" "in" site.Params.mainSections }}
+{{- if and (gt (len $pages) 1) (in $pages . ) }}
 <nav class="paginav">
-  <a href="/" onclick="window.history()">
-    Go Back
+  {{- with $pages.Next . }}
+  <a class="prev" href="{{ .Permalink }}">
+    <span class="title">« {{ i18n "prev_page" }}</span>
+    <br>
+    <span>{{- .Name -}}</span>
   </a>
+  {{- end }}
+  {{- with $pages.Prev . }}
+  <a class="next" href="{{ .Permalink }}">
+    <span class="title">{{ i18n "next_page" }} »</span>
+    <br>
+    <span>{{- .Name -}}</span>
+  </a>
+  {{- end }}
 </nav>
+{{- end }}