diff --git a/src/General/Index.coffee b/src/General/Index.coffee
index 64714e7f6..7ee9ca994 100644
--- a/src/General/Index.coffee
+++ b/src/General/Index.coffee
@@ -23,7 +23,8 @@ Index =
 
     $.addClass doc, 'index-loading', "#{Conf['Index Mode'].replace /\ /g, '-'}-mode"
     $.on window, 'popstate', @cb.popstate
-    $.on d, 'scroll', Index.scroll
+    $.on d, 'scroll', @scroll
+    $.on d, 'SortIndex', @cb.resort
 
     # Header refresh button
     @button = $.el 'a',
diff --git a/src/Monitoring/ThreadWatcher.coffee b/src/Monitoring/ThreadWatcher.coffee
index 01b516cd4..4e5b5894d 100644
--- a/src/Monitoring/ThreadWatcher.coffee
+++ b/src/Monitoring/ThreadWatcher.coffee
@@ -336,9 +336,8 @@ ThreadWatcher =
     for refresher in ThreadWatcher.menu.refreshers
       refresher()
 
-    if Index.nodes and Conf['Pin Watched Threads'] and Conf['Index Mode'] is 'catalog'
-      Index.sort()
-      Index.buildIndex()
+    if Conf['Pin Watched Threads'] and Conf['Index Mode'] is 'catalog'
+      $.event 'SortIndex'
 
   refreshIcon: ->
     for className in ['replies-unread', 'replies-quoting-you']