diff --git a/templates/comments.php b/templates/comments.php
index fcb24a8..5a0f346 100644
--- a/templates/comments.php
+++ b/templates/comments.php
@@ -44,8 +44,18 @@
 
     <?php if (get_comment_pages_count() > 1 && get_option('page_comments')) : // are there comments to navigate through ?>
       <nav id="comments-nav" class="pager">
-        <div class="previous"><?php previous_comments_link(__('&larr; Older comments', 'roots')); ?></div>
-        <div class="next"><?php next_comments_link(__('Newer comments &rarr;', 'roots')); ?></div>
+        <ul class="pager">
+          <?php if (get_previous_comments_link()) : ?>
+            <li class="previous"><?php previous_comments_link(__('&larr; Older comments', 'roots')); ?></li>
+          <?php else: ?>
+            <li class="previous disabled"><a><?php _e('&larr; Older comments', 'roots'); ?></a></li>
+          <?php endif; ?>
+          <?php if (get_next_comments_link()) : ?>
+            <li class="next"><?php next_comments_link(__('Newer comments &rarr;', 'roots')); ?></li>
+          <?php else: ?>
+            <li class="next disabled"><a><?php _e('Newer comments &rarr;', 'roots'); ?></a></li>
+          <?php endif; ?>
+        </ul>
       </nav>
 
     <?php endif; // check for comment navigation ?>
diff --git a/templates/content.php b/templates/content.php
index 5f21c7e..fc4084e 100644
--- a/templates/content.php
+++ b/templates/content.php
@@ -22,8 +22,18 @@
 <?php endwhile; ?>
 
 <?php if ($wp_query->max_num_pages > 1) : ?>
-  <nav id="post-nav" class="pager">
-    <div class="previous"><?php next_posts_link(__('&larr; Older posts', 'roots')); ?></div>
-    <div class="next"><?php previous_posts_link(__('Newer posts &rarr;', 'roots')); ?></div>
+  <nav id="post-nav">
+    <ul class="pager">
+      <?php if (get_next_posts_link()) : ?>
+        <li class="previous"><?php next_posts_link(__('&larr; Older posts', 'roots')); ?></li>
+      <?php else: ?>
+        <li class="previous disabled"><a><?php _e('&larr; Older posts', 'roots'); ?></a></li>
+      <?php endif; ?>
+      <?php if (get_previous_posts_link()) : ?>
+        <li class="next"><?php previous_posts_link(__('Newer posts &rarr;', 'roots')); ?></li>
+      <?php else: ?>
+        <li class="next disabled"><a><?php _e('Newer posts &rarr;', 'roots'); ?></a></li>
+      <?php endif; ?>
+    </ul>
   </nav>
 <?php endif; ?>