diff --git a/src/ChangeLog b/src/ChangeLog
index a5f6ab650e..d883230f2d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-01  Lars Gullik Bjønnes  <larsbj@birdstep.com>
+
+	* paragraph.C (BreakParagraph): set the inset_owner in the new par
+	to the same as the par we break from
+
 2001-05-31  Lars Gullik Bjønnes  <larsbj@birdstep.com>
 
 	* commandtags.h: add LFUN_INSET_WIDE_FLOAT
diff --git a/src/paragraph.C b/src/paragraph.C
index 62d8208078..1f05276cde 100644
--- a/src/paragraph.C
+++ b/src/paragraph.C
@@ -964,6 +964,8 @@ void LyXParagraph::BreakParagraph(BufferParams const & bparams,
 {
 	// create a new paragraph
 	LyXParagraph * tmp = new LyXParagraph(this);
+	// remember to set the inset_owner
+	tmp->SetInsetOwner(InInset());
 	
 	// this is an idea for a more userfriendly layout handling, I will
 	// see what the users say
diff --git a/src/text2.C b/src/text2.C
index 3fe279c4c1..ecfef3dfa7 100644
--- a/src/text2.C
+++ b/src/text2.C
@@ -1674,6 +1674,7 @@ void LyXText::SetCounter(Buffer const * buf, LyXParagraph * par) const
 		if (layout.labeltype == LABEL_SENSITIVE) {
 			bool isOK (par->InInset() && par->InInset()->owner() &&
 				   (par->InInset()->owner()->LyxCode() == Inset::FLOAT_CODE));
+			
 			if (isOK) {
 				InsetFloat * tmp = static_cast<InsetFloat*>(par->InInset()->owner());
 				Floating const & fl