diff --git a/src/General/Index.coffee b/src/General/Index.coffee
index 5d1389b60..1c181b444 100644
--- a/src/General/Index.coffee
+++ b/src/General/Index.coffee
@@ -391,13 +391,14 @@ Index =
   pageLoad: (scroll=true) ->
     return unless Index.liveThreadData
     {threads, search, mode, sort, page, hash} = Index.changed
-    Index.sort()          if threads or search or sort
-    Index.buildPagelist() if threads or search
+    threads or= search
+    Index.sort()          if threads or sort
+    Index.buildPagelist() if threads
     Index.setupSearch()   if search
     Index.setupMode()     if mode
     Index.setupSort()     if sort
-    Index.buildIndex()    if threads or search or mode or page or sort
-    Index.setPage()       if threads or search or page
+    Index.buildIndex()    if threads or mode or page or sort
+    Index.setPage()       if threads or page
     Index.scrollToIndex() if scroll and not hash
     Header.hashScroll()   if hash
     Index.changed = {}