diff --git a/CHANGELOG.md b/CHANGELOG.md
index ed12aa9c5..ef7ab650e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
  - This merges `Mark Quotes of You`, `Mark OP Quotes` and `Mark Cross-thread Quotes` into one feature.
  - Backlinks now also get these markers.
  - Multiple markers are now more compact, for example `>>123 (You/OP)` instead of `>>123 (You) (OP)`.
+- New setting: `Image Hover in Catalog`
+ - Like `Image Hover`, but for the catalog only.
 
 ### 3.16.5 - *2014-02-07*
 
diff --git a/src/General/Config.coffee b/src/General/Config.coffee
index 9b523b481..b836adbdd 100644
--- a/src/General/Config.coffee
+++ b/src/General/Config.coffee
@@ -24,6 +24,7 @@ Config =
       'Auto-GIF':                     [false, 'Animate GIF thumbnails (disabled on /gif/, /wsg/).']
       'Image Expansion':              [true,  'Expand images inline.']
       'Image Hover':                  [false, 'Show a floating expanded image on hover.']
+      'Image Hover in Catalog':       [false, 'Show a floating expanded image on hover in the catalog.']
       'Sauce':                        [true,  'Add sauce links to images.']
       'Reveal Spoilers':              [false, 'Reveal spoiler thumbnails.']
     'Linkification':
diff --git a/src/Images/ImageHover.coffee b/src/Images/ImageHover.coffee
index 21d9c2b4c..740d80972 100644
--- a/src/Images/ImageHover.coffee
+++ b/src/Images/ImageHover.coffee
@@ -1,13 +1,13 @@
 ImageHover =
   init: ->
-    return if !Conf['Image Hover']
-
-    Post.callbacks.push
-      name: 'Image Hover'
-      cb:   @node
-    CatalogThread.callbacks.push
-      name: 'Image Hover'
-      cb:   @catalogNode
+    if Conf['Image Hover']
+      Post.callbacks.push
+        name: 'Image Hover'
+        cb:   @node
+    if Conf['Image Hover in Catalog']
+      CatalogThread.callbacks.push
+        name: 'Image Hover'
+        cb:   @catalogNode
   node: ->
     return unless @file?.isImage
     $.on @file.thumb, 'mouseover', ImageHover.mouseover