diff --git a/src/General/Index.coffee b/src/General/Index.coffee
index 5672d6916..fd11b4769 100644
--- a/src/General/Index.coffee
+++ b/src/General/Index.coffee
@@ -11,6 +11,9 @@ Index =
 
     return unless Conf['JSON Index']
 
+    Callbacks.Post.push
+      name: 'Index Page Numbers'
+      cb:   @node
     Callbacks.CatalogThread.push
       name: 'Catalog Features'
       cb:   @catalogNode
@@ -194,6 +197,10 @@ Index =
           $.on @el, 'click', @cb
           true
 
+  node: ->
+    return if @isReply or @isClone or not (Index.threadPosition[@ID]?)
+    @thread.setPage(Index.threadPosition[@ID] // Index.threadsNumPerPage + 1)
+
   catalogNode: ->
     $.on @nodes.root, 'mousedown click', (e) =>
       return unless e.button is 0 and e.shiftKey
@@ -631,12 +638,12 @@ Index =
 
         if ((OP = thread.OP) and not OP.isFetchedQuote)
           OP.setCatalogOP false
+          thread.setPage(Index.threadPosition[ID] // Index.threadsNumPerPage + 1)
         else
           obj = Index.parsedThreads[ID]
           OP = new Post Build.post(obj), thread, g.BOARD
           OP.filterResults = obj.filterResults
           newPosts.push OP
-        thread.setPage(Index.threadPosition[ID] // Index.threadsNumPerPage + 1)
 
         Build.thread thread, threadData
       catch err