diff --git a/ChangeLog b/ChangeLog
index d26cf9b18c..b279f0da99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 Sun Mar 15 06:15:37 1998  Tim Janik  <timj@gimp.org>
 
+	* app/gimage.c (gimage_remove_layer): check whether the removed layer
+	is floating_sel *and* check whether it is active_layer.
+
 	* plug-ins/exchange/exchange.c (doDialog): also destroy the main dialog
 	if the "Cancel" button is clicked.
 
diff --git a/app/gimage.c b/app/gimage.c
index 47e59eb37c..e2b1399280 100644
--- a/app/gimage.c
+++ b/app/gimage.c
@@ -2193,7 +2193,7 @@ gimage_remove_layer (GImage *gimage, Layer * layer)
 
 	  floating_sel_reset (layer);
 	}
-      else if (gimage->active_layer == layer)
+      if (gimage->active_layer == layer)
 	{
 	  if (gimage->layers)
 	    gimage->active_layer = (Layer *) gimage->layer_stack->data;