diff --git a/js/expand-all-images.js b/js/expand-all-images.js
index 82ea6340..6d7b4ca0 100644
--- a/js/expand-all-images.js
+++ b/js/expand-all-images.js
@@ -23,6 +23,14 @@ onready(function(){
 		.text(_('Expand all images'))
 		.click(function() {
 			$('a img.post-image').each(function() {
+				// Don't expand YouTube embeds
+				if ($(this).parent().parent().hasClass('video-container'))
+					return;
+
+				// or WEBM
+				if (/^\/player\.php\?/.test($(this).parent().attr('href')))
+					return;
+
 				if (!$(this).parent()[0].dataset.expanded)
 					$(this).parent().click();
 			});