diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index 8612fd2e70..120ff0c16b 100644
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,10 @@
+2002-05-09  Juergen Vigna  <jug@sad.it>
+
+	* insetcollapsable.C (edit): first_after_edit should only be
+	set to true if we enter this inset and it was collapsed so we
+	open it up. This is needed to reclose it after a search/replace
+	or spellcheck function opened it and was negative.
+
 2002-05-09  Dekel Tsur  <dekelts@tau.ac.il>
 
 	* insetfloat.C (latex): Return correct value.
diff --git a/src/insets/insetcollapsable.C b/src/insets/insetcollapsable.C
index ca3defd7c8..b9a34a777d 100644
--- a/src/insets/insetcollapsable.C
+++ b/src/insets/insetcollapsable.C
@@ -276,12 +276,12 @@ void InsetCollapsable::edit(BufferView * bv, bool front)
 		inset.setUpdateStatus(bv, InsetText::FULL);
 		bv->updateInset(this, false);
 		inset.edit(bv, front);
+		first_after_edit = true;
 	} else {
 		if (!bv->lockInset(this))
 			return;
 		inset.edit(bv, front);
 	}
-	first_after_edit = true;
 }