diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index 67cfac773..88e4b2754 100644
--- a/builds/4chan-X.user.js
+++ b/builds/4chan-X.user.js
@@ -3119,6 +3119,7 @@
     setPage: function(pageNum) {
       var a, href, maxPageNum, next, pagesRoot, prev, strong;
       pageNum || (pageNum = Index.getCurrentPage());
+      Index.pageNum = pageNum;
       maxPageNum = Index.getMaxPageNum();
       pagesRoot = $('.pages', Index.pagelist);
       prev = pagesRoot.previousSibling.firstChild;
@@ -3501,6 +3502,9 @@
         case 'paged':
         case 'infinite':
           pageNum = Index.getCurrentPage();
+          if (Index.isSearching) {
+            Index.setPage(pageNum = 0);
+          }
           if (pageNum > Index.getMaxPageNum()) {
             Index.pageNav(Index.getMaxPageNum());
             return;
diff --git a/builds/crx/script.js b/builds/crx/script.js
index 20d190dc1..361870e7d 100644
--- a/builds/crx/script.js
+++ b/builds/crx/script.js
@@ -3180,6 +3180,7 @@
     setPage: function(pageNum) {
       var a, href, maxPageNum, next, pagesRoot, prev, strong;
       pageNum || (pageNum = Index.getCurrentPage());
+      Index.pageNum = pageNum;
       maxPageNum = Index.getMaxPageNum();
       pagesRoot = $('.pages', Index.pagelist);
       prev = pagesRoot.previousSibling.firstChild;
@@ -3562,6 +3563,9 @@
         case 'paged':
         case 'infinite':
           pageNum = Index.getCurrentPage();
+          if (Index.isSearching) {
+            Index.setPage(pageNum = 0);
+          }
           if (pageNum > Index.getMaxPageNum()) {
             Index.pageNav(Index.getMaxPageNum());
             return;
diff --git a/src/General/Index.coffee b/src/General/Index.coffee
index fac4f7bab..c512c912f 100644
--- a/src/General/Index.coffee
+++ b/src/General/Index.coffee
@@ -451,6 +451,7 @@ Index =
 
   setPage: (pageNum) ->
     pageNum  or= Index.getCurrentPage()
+    Index.pageNum = pageNum
     maxPageNum = Index.getMaxPageNum()
     pagesRoot  = $ '.pages', Index.pagelist
     # Previous/Next buttons
@@ -739,6 +740,8 @@ Index =
     switch Conf['Index Mode']
       when 'paged', 'infinite'
         pageNum = Index.getCurrentPage()
+        if Index.isSearching
+          Index.setPage pageNum = 0
         if pageNum > Index.getMaxPageNum()
           # Go to the last available page if we were past the limit.
           Index.pageNav Index.getMaxPageNum()