diff --git a/4chan_x.user.js b/4chan_x.user.js
index bb62f2949..d0593fb44 100644
--- a/4chan_x.user.js
+++ b/4chan_x.user.js
@@ -3467,9 +3467,10 @@
         return ImageExpand.toggle(Get.postFromNode(this));
       },
       all: function() {
-        var ID, file, post, thumb, _i, _len, _ref, _ref1;
+        var ID, file, func, post, posts, _i, _j, _len, _len1, _ref, _ref1;
         $.event('CloseMenu');
         ImageExpand.on = this.checked;
+        posts = [];
         _ref = g.posts;
         for (ID in _ref) {
           post = _ref[ID];
@@ -3477,23 +3478,20 @@
           for (_i = 0, _len = _ref1.length; _i < _len; _i++) {
             post = _ref1[_i];
             file = post.file;
-            if (!(file && file.isImage)) {
+            if (!(file && file.isImage && doc.contains(post.nodes.root))) {
               continue;
             }
-            thumb = file.thumb;
-            if (!doc.contains(thumb)) {
+            if (ImageExpand.on && (!ImageExpand.spoilers && file.isSpoiler || ImageExpand.fromPosition && file.thumb.getBoundingClientRect().top < 0)) {
               continue;
             }
-            if (ImageExpand.on) {
-              if (!ImageExpand.spoilers && file.isSpoiler || ImageExpand.fromPosition && thumb.getBoundingClientRect().top < 0) {
-                continue;
-              }
-              ImageExpand.expand(post);
-            } else {
-              ImageExpand.contract(post);
-            }
+            posts.push(post);
           }
         }
+        func = ImageExpand.on ? ImageExpand.expand : ImageExpand.contract;
+        for (_j = 0, _len1 = posts.length; _j < _len1; _j++) {
+          post = posts[_j];
+          func(post);
+        }
       },
       updateFitness: function() {
         var checked;
@@ -3616,7 +3614,7 @@
           return;
         }
         el = $.el('span', {
-          textContent: 'Image expansion'
+          textContent: 'Image Expansion'
         });
         ImageExpand.menu.config = $.get('ImageExpansionConfig', {
           'Fit width': true,
diff --git a/src/features.coffee b/src/features.coffee
index 1f4ff4e7b..914ec0e19 100644
--- a/src/features.coffee
+++ b/src/features.coffee
@@ -2114,19 +2114,19 @@ ImageExpand =
     all: ->
       $.event 'CloseMenu'
       ImageExpand.on = @checked
+      posts = []
       for ID, post of g.posts
         for post in [post].concat post.clones
           {file} = post
-          continue unless file and file.isImage
-          {thumb} = file
-          continue unless doc.contains thumb
-          if ImageExpand.on
-            if !ImageExpand.spoilers and file.isSpoiler or
-              ImageExpand.fromPosition and thumb.getBoundingClientRect().top < 0
-                continue
-            ImageExpand.expand post
-          else
-            ImageExpand.contract post
+          continue unless file and file.isImage and doc.contains post.nodes.root
+          if ImageExpand.on and
+            (!ImageExpand.spoilers and file.isSpoiler or
+            ImageExpand.fromPosition and file.thumb.getBoundingClientRect().top < 0)
+              continue
+          posts.push post
+      func = if ImageExpand.on then ImageExpand.expand else ImageExpand.contract
+      for post in posts
+        func post
       return
     updateFitness: ->
       {checked} = @
@@ -2211,7 +2211,7 @@ ImageExpand =
       return if g.VIEW is 'catalog' or !Conf['Image Expansion']
 
       el = $.el 'span',
-        textContent: 'Image expansion'
+        textContent: 'Image Expansion'
 
       ImageExpand.menu.config = $.get 'ImageExpansionConfig',
         'Fit width':  true