diff --git a/src/General/Config.coffee b/src/General/Config.coffee
index 45408e983..063259202 100755
--- a/src/General/Config.coffee
+++ b/src/General/Config.coffee
@@ -553,6 +553,7 @@ http://iqdb.org/?url=%TURL
 
   Index:
     'Index Mode': 'paged'
+    'Previous Index Mode': 'paged'
     'Index Sort': 'bump'
     'Show Replies': true
     'Anchor Hidden Threads': true
diff --git a/src/General/Index.coffee b/src/General/Index.coffee
index 9810723f6..2d8eb2125 100644
--- a/src/General/Index.coffee
+++ b/src/General/Index.coffee
@@ -233,6 +233,10 @@ Index =
       Index.cb.toggleCatalogMode()
       Index.togglePagelist()
       Index.buildIndex()
+      mode = Conf['Index Mode']
+      if mode not in ['catalog', Conf['Previous Index Mode']]
+        Conf['Previous Index Mode'] = mode
+        $.set 'Previous Index Mode', mode
     sort: ->
       Index.sort()
       Index.buildIndex()