diff --git a/src/Miscellaneous/PostJumper.coffee b/src/Miscellaneous/PostJumper.coffee
index e8f7ef89b..ec98468d7 100644
--- a/src/Miscellaneous/PostJumper.coffee
+++ b/src/Miscellaneous/PostJumper.coffee
@@ -9,7 +9,7 @@ PostJumper =
       cb:   @node
 
   node: ->
-    if @nodes.uniqueIDRoot
+    if @nodes.uniqueIDRoot and Conf['Unique ID Navigation']
       uniqueID = @nodes.uniqueID.innerText
       IDButtons = PostJumper.makeButtons 'uniqueIDJumper'
       $.after @nodes.uniqueIDRoot, IDButtons
@@ -19,7 +19,7 @@ PostJumper =
         PostJumper.uniqueIDsMap.set uniqueID, []
       PostJumper.uniqueIDsMap.get(uniqueID).push @nodes.quote.innerText        
         
-    if @nodes.capcode
+    if @nodes.capcode and Conf['Capcode Navigation']
       capcode = @nodes.capcode.innerText
       capcodeButtons = PostJumper.makeButtons 'capcodeJumper'
       $.after @nodes.capcode, capcodeButtons
diff --git a/src/config/Config.coffee b/src/config/Config.coffee
index f4ddc3dae..fec89d1ac 100644
--- a/src/config/Config.coffee
+++ b/src/config/Config.coffee
@@ -92,6 +92,14 @@ Config =
         false
         'Add buttons to navigate to top / bottom of thread.'
       ]
+      'Unique ID Navigation': [
+        false
+        'Add buttons to navigate to posts having the same unique ID.'
+      ]
+      'Capcode Navigation': [
+        false
+        'Add buttons to navigate to posts having the same capcode.'
+      ]
       'Custom Board Titles': [
         true
         'Allow editing of the board title and subtitle by ctrl/\u2318+clicking them.'