diff --git a/src/General/Index.coffee b/src/General/Index.coffee
index 8c6512890..fe07e5401 100644
--- a/src/General/Index.coffee
+++ b/src/General/Index.coffee
@@ -693,14 +693,6 @@ Index =
       when 'all pages', 'catalog'
         threads = Index.sortedThreads
       else
-        if Index.followedThreadID?
-          i = 0
-          i++ while Index.followedThreadID isnt Index.sortedThreads[i].ID
-          page = i // Index.threadsNumPerPage + 1
-          if page isnt Index.currentPage
-            Index.currentPage = page
-            Index.pushState {page}
-            Index.setPage()
         threads = Index.threadsOnPage Index.currentPage
     delete Index.pageNum
     $.rmAll Index.root
@@ -714,8 +706,6 @@ Index =
     else
       Index.buildReplies   threads if Conf['Show Replies']
       Index.buildStructure threads
-      if Index.followedThreadID? and (post = g.posts["#{g.BOARD}.#{Index.followedThreadID}"])
-        Header.scrollTo post.nodes.root
 
   threadsOnPage: (pageNum) ->
     nodesPerPage = Index.threadsNumPerPage
diff --git a/src/Monitoring/ThreadWatcher.coffee b/src/Monitoring/ThreadWatcher.coffee
index 242523cac..01b516cd4 100644
--- a/src/Monitoring/ThreadWatcher.coffee
+++ b/src/Monitoring/ThreadWatcher.coffee
@@ -125,9 +125,7 @@ ThreadWatcher =
       $.event 'CloseMenu'
     toggle: ->
       {thread} = Get.postFromNode @
-      Index.followedThreadID = thread.ID
       ThreadWatcher.toggle thread
-      delete Index.followedThreadID
     rm: ->
       [boardID, threadID] = @parentNode.dataset.fullID.split '.'
       ThreadWatcher.rm boardID, +threadID
@@ -338,7 +336,7 @@ ThreadWatcher =
     for refresher in ThreadWatcher.menu.refreshers
       refresher()
 
-    if Index.nodes and Conf['Pin Watched Threads']
+    if Index.nodes and Conf['Pin Watched Threads'] and Conf['Index Mode'] is 'catalog'
       Index.sort()
       Index.buildIndex()