diff --git a/src/Miscellaneous/PostJumper.coffee b/src/Miscellaneous/PostJumper.coffee
index 448c7af83..4be582528 100644
--- a/src/Miscellaneous/PostJumper.coffee
+++ b/src/Miscellaneous/PostJumper.coffee
@@ -2,10 +2,7 @@ PostJumper =
   init: ->
     return unless Conf['Unique ID and Capcode Navigation'] and g.VIEW in ['index', 'thread']
 
-    @maps =
-      capcode:  Object.create(null)
-      uniqueID: Object.create(null)
-    @buttons  = @makeButtons()
+    @buttons = @makeButtons()
 
     Callbacks.Post.push
       name: 'Post Jumper'
@@ -26,29 +23,31 @@ PostJumper =
   addButtons: (post,type) ->
     value = post.nodes[type].innerText
     buttons = PostJumper.buttons.cloneNode(true)
-    buttons.dataset.type = type
+    $.extend buttons.dataset, {type, value}
     $.after post.nodes[type+(if type is 'capcode' then '' else 'Root')], buttons
     PostJumper.addListeners buttons
-    if value not of PostJumper.maps[type]
-      PostJumper.maps[type][value] = []
-    PostJumper.maps[type][value].push {key: post.ID, val: post.fullID}
-    PostJumper.maps[type][value].sort (first,second) -> first.key-second.key
 
   addListeners: (buttons) ->
     $.on buttons.firstChild, 'click', PostJumper.buttonClick
     $.on buttons.lastChild, 'click', PostJumper.buttonClick
 
   buttonClick: ->
-    post = Get.postFromNode @
-    {type} = @parentNode.dataset
     dir = if $.hasClass(@, 'prev') then -1 else 1
-    value = (if type is 'capcode' then '## ' else '') + post.info[type]
-    fromID = post.ID
-    idx = PostJumper.indexOfPair PostJumper.maps[type][value],fromID
-    return if idx is -1
-    idx = (idx + dir) %% PostJumper.maps[type][value].length
-    toID= PostJumper.maps[type][value][idx].val
-    PostJumper.scroll post, g.posts[toID]
+    if (toJumper = PostJumper.find @parentNode, dir)
+      PostJumper.scroll @parentNode, toJumper
+
+  find: (jumper, dir) ->
+    {type, value} = jumper.dataset
+    xpath = "span[contains(@class,\"postJumper\") and @data-value=\"#{value}\" and @data-type=\"#{type}\"]"
+    axis = if dir < 0 then 'preceding' else 'following'
+    jumper2 = jumper
+    while (jumper2 = $.x "#{axis}::#{xpath}", jumper2)
+      return jumper2 if jumper2.getBoundingClientRect().height
+    if (jumper2 = $.x "(//#{xpath})[#{if dir < 0 then 'last()' else '1'}]")
+      return jumper2 if jumper2.getBoundingClientRect().height
+    while (jumper2 = $.x "#{axis}::#{xpath}", jumper2) and jumper2 isnt jumper
+      return jumper2 if jumper2.getBoundingClientRect().height
+    null
 
   makeButtons: ->
     charPrev = '\u23EB'
@@ -60,16 +59,7 @@ PostJumper =
     $.extend span, <%= html('<a href="javascript:void(0);" class="${classPrev}">${charPrev}</a><a href="javascript:void(0);" class="${classNext}">${charNext}</a>') %>
     span
 
-  scroll: (fromPost, toPost) ->
-    prevPos = fromPost.nodes.nameBlock.getBoundingClientRect().top
-    destPos = toPost.nodes.nameBlock.getBoundingClientRect().top
+  scroll: (fromJumper, toJumper) ->
+    prevPos = fromJumper.getBoundingClientRect().top
+    destPos = toJumper.getBoundingClientRect().top
     window.scrollBy 0, destPos-prevPos
-
-  indexOfPair: (array,key) ->
-    result = -1;
-    for i in [0..array.length-1] by 1
-      if array[i].key is key
-        result = i
-        break
-    result
-    
\ No newline at end of file