diff --git a/template/index.twig b/template/index.twig
index 43e704f..36a6397 100644
--- a/template/index.twig
+++ b/template/index.twig
@@ -24,10 +24,10 @@
                 
                 <div class="info">
                     {{ post.vote }} votes
-                    <em>{{ post.created|ago }}</em>
+                    <em><a href="post/{{ post.hashId }}">{{ post.created|ago }}</a></em>
                     by <a href="{{ ('user/' ~ post.username)|docroot }}">{{ post.username }}</a> •
                     
-                    <a href="post/{{ post.hashId }}">{{ post.commentsCount ? post.commentsCount ~ ' comments' : 'discuss' }}</a>
+                    <a href="post/{{ post.hashId }}#comments">{{ post.commentsCount ? post.commentsCount ~ ' comments' : 'discuss' }}</a>
                 </div>
             </td>
         </tr>
diff --git a/template/post.twig b/template/post.twig
index 757c686..9aaca20 100644
--- a/template/post.twig
+++ b/template/post.twig
@@ -23,7 +23,7 @@
 
                 <div class="info">
                     by <a href="{{ ('user/' ~ post.username)|docroot }}">{{ post.username }}</a> <em>{{ post.created|ago }}</em>
-                    — {{ post.vote }} votes, {{ post.commentsCount }} comments
+                    — {{ post.vote }} votes, <a href="#comments">{{ post.commentsCount }} comments</a>
                 
                     {% if user and post.userId == user.id %}
                         — <a href="../edit?post={{ post.hashId }}">Edit</a>
@@ -37,6 +37,9 @@
         {{ post.text|markdown|raw }}
     </div>
     
+    {# An anchor for where the comments section starts #}
+    <a id="comments"></a>
+    
     {% if user %}
         <form action="" method="post" class="new_comment">
             <textarea name="new_comment" class="form-control" placeholder="Write a comment"></textarea>