diff --git a/post.hbs b/post.hbs
index 2c0dd5a..b00318c 100644
--- a/post.hbs
+++ b/post.hbs
@@ -50,24 +50,38 @@
         {{/if}}
 
         {{!-- Next/Prev Navigation --}}
-        <nav class="mt-16 grid grid-cols-1 md:grid-cols-2 gap-4 border-t border-[var(--bg-tertiary)] pt-12">
-            <div class="prev-post-nav">
-                {{#prev_post}}
-                    <a href="{{url}}" class="group block p-6 bg-[var(--bg-secondary)] rounded-lg hover:bg-[var(--bg-tertiary)] transition-all duration-300">
-                        <span class="text-xs uppercase tracking-widest text-[var(--text-tertiary)] mb-2 block">&larr; Previous Post</span>
-                        <h4 class="text-xl font-bold group-hover:text-[var(--brand-primary)] transition-colors duration-300">{{title}}</h4>
-                    </a>
-                {{/prev_post}}
-            </div>
-            <div class="next-post-nav md:text-right">
-                {{#next_post}}
+        {{#next_post}}
+            <nav class="mt-16 grid grid-cols-1 md:grid-cols-2 gap-4 border-t border-[var(--bg-tertiary)] pt-12">
+                <div class="prev-post-nav">
+                    {{#../prev_post}}
+                        <a href="{{url}}" class="group block p-6 bg-[var(--bg-secondary)] rounded-lg hover:bg-[var(--bg-tertiary)] transition-all duration-300">
+                            <span class="text-xs uppercase tracking-widest text-[var(--text-tertiary)] mb-2 block">&larr; Previous Post</span>
+                            <h4 class="text-xl font-bold group-hover:text-[var(--brand-primary)] transition-colors duration-300">{{title}}</h4>
+                        </a>
+                    {{/../prev_post}}
+                </div>
+                <div class="next-post-nav md:text-right">
                     <a href="{{url}}" class="group block p-6 bg-[var(--bg-secondary)] rounded-lg hover:bg-[var(--bg-tertiary)] transition-all duration-300">
                         <span class="text-xs uppercase tracking-widest text-[var(--text-tertiary)] mb-2 block">Next Post &rarr;</span>
                         <h4 class="text-xl font-bold group-hover:text-[var(--brand-primary)] transition-colors duration-300">{{title}}</h4>
                     </a>
-                {{/next_post}}
-            </div>
-        </nav>
+                </div>
+            </nav>
+        {{else}}
+            {{#prev_post}}
+                <nav class="mt-16 grid grid-cols-1 md:grid-cols-2 gap-4 border-t border-[var(--bg-tertiary)] pt-12">
+                    <div class="prev-post-nav">
+                        <a href="{{url}}" class="group block p-6 bg-[var(--bg-secondary)] rounded-lg hover:bg-[var(--bg-tertiary)] transition-all duration-300">
+                            <span class="text-xs uppercase tracking-widest text-[var(--text-tertiary)] mb-2 block">&larr; Previous Post</span>
+                            <h4 class="text-xl font-bold group-hover:text-[var(--brand-primary)] transition-colors duration-300">{{title}}</h4>
+                        </a>
+                    </div>
+                    <div class="next-post-nav md:text-right">
+                        {{!-- No next post --}}
+                    </div>
+                </nav>
+            {{/prev_post}}
+        {{/next_post}}
     {{/is}}
 
     {{#is "post"}}