diff --git a/app/core/gimpimage-merge.c b/app/core/gimpimage-merge.c
index 5a5f82bed6..8e332cd215 100644
--- a/app/core/gimpimage-merge.c
+++ b/app/core/gimpimage-merge.c
@@ -36,6 +36,7 @@
 
 #include "gimp.h"
 #include "gimpcontext.h"
+#include "gimpdrawable-filters.h"
 #include "gimperror.h"
 #include "gimpgrouplayer.h"
 #include "gimpimage.h"
@@ -601,6 +602,10 @@ gimp_image_merge_layers (GimpImage     *image,
 
       layer = layers->data;
 
+      /* Merge down filter effects so they can be restored on undo */
+      gimp_drawable_merge_filters (GIMP_DRAWABLE (layer));
+      gimp_drawable_clear_filters (GIMP_DRAWABLE (layer));
+
       gimp_item_get_offset (GIMP_ITEM (layer), &off_x, &off_y);
 
       switch (merge_type)