diff --git a/4chan_x.user.js b/4chan_x.user.js
index cf4f89bff..67fda4696 100644
--- a/4chan_x.user.js
+++ b/4chan_x.user.js
@@ -110,7 +110,8 @@
         'Report Button': [true, 'Add report buttons'],
         'Comment Expansion': [true, 'Expand too long comments'],
         'Thread Expansion': [true, 'View all replies'],
-        'Thread Navigation': [true, 'Navigate to previous / next thread']
+        'Index Navigation': [true, 'Navigate to previous / next thread'],
+        'Reply Navigation': [false, 'Navigate to top / bottom of thread']
       }
     },
     flavors: ['http://regex.info/exif.cgi?url=', 'http://iqdb.org/?url=', 'http://google.com/searchbyimage?image_url=', 'http://tineye.com/search?url=', '#http://saucenao.com/search.php?db=999&url='].join('\n'),
@@ -2582,9 +2583,6 @@
       if ($.config('Keybinds')) {
         keybinds.init();
       }
-      if ($.config('Thread Navigation')) {
-        nav.init();
-      }
       threading.init();
       if (g.REPLY) {
         if ($.config('Thread Updater')) {
@@ -2608,7 +2606,13 @@
         if ($.config('Auto Watch') && $.config('Thread Watcher') && location.hash === '#watch' && $('img.favicon').src === Favicon.empty) {
           watcher.watch(null, g.THREAD_ID);
         }
+        if ($.config('Reply Navigation')) {
+          nav.init();
+        }
       } else {
+        if ($.config('Index Navigation')) {
+          nav.init();
+        }
         if ($.config('Thread Hiding')) {
           threadHiding.init();
         }
diff --git a/script.coffee b/script.coffee
index 5c9712834..9cd4448b4 100644
--- a/script.coffee
+++ b/script.coffee
@@ -42,7 +42,8 @@ config =
       'Report Button':      [true,  'Add report buttons']
       'Comment Expansion':  [true,  'Expand too long comments']
       'Thread Expansion':   [true,  'View all replies']
-      'Thread Navigation':  [true,  'Navigate to previous / next thread']
+      'Index Navigation':   [true,  'Navigate to previous / next thread']
+      'Reply Navigation':   [false, 'Navigate to top / bottom of thread']
   flavors: [
     'http://regex.info/exif.cgi?url='
     'http://iqdb.org/?url='
@@ -1954,9 +1955,6 @@ main =
     if $.config 'Keybinds'
       keybinds.init()
 
-    if $.config 'Thread Navigation'
-      nav.init()
-
     threading.init()
 
     if g.REPLY
@@ -1982,7 +1980,13 @@ main =
         location.hash is '#watch' and $('img.favicon').src is Favicon.empty
           watcher.watch null, g.THREAD_ID
 
+      if $.config 'Reply Navigation'
+        nav.init()
+
     else #not reply
+      if $.config 'Index Navigation'
+        nav.init()
+
       if $.config 'Thread Hiding'
         threadHiding.init()