diff --git a/ChangeLog b/ChangeLog
index 15cd707b8c..1b98065142 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-28  Michael Natterer  <mitch@gimp.org>
+
+	* app/core/gimpimage-undo-push.c (undo_pop_layer): when re-adding
+	a layer with mask, don't forget to set layer->mask->removed to FALSE.
+
 2004-03-28  Michael Natterer  <mitch@gimp.org>
 
 	* app/core/gimpitem.[ch]: added "gboolean removed" to the GimpItem
diff --git a/app/core/gimpimage-undo-push.c b/app/core/gimpimage-undo-push.c
index 25ec61f157..7b536c9a3f 100644
--- a/app/core/gimpimage-undo-push.c
+++ b/app/core/gimpimage-undo-push.c
@@ -1400,6 +1400,9 @@ undo_pop_layer (GimpUndo            *undo,
 	gimp_image_floating_selection_changed (undo->gimage);
 
       GIMP_ITEM (layer)->removed = FALSE;
+
+      if (layer->mask)
+        GIMP_ITEM (layer->mask)->removed = FALSE;
     }
 
   if (old_has_alpha != gimp_image_has_alpha (undo->gimage))