diff --git a/src/ChangeLog b/src/ChangeLog
index f50c4d3816..e1cadd9cba 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2005-07-15    <lgb@tandberg.net>
 
+	* paragraph_funcs.C (breakParagraph): dont reset the layout on
+	keepEmpty paragraphs
+
 	* text.C (setCursorFromCoordinates): add a debug statement
 
 	* text2.C (getColumnNearX): bug 1825 make sure that we don't
diff --git a/src/paragraph_funcs.C b/src/paragraph_funcs.C
index 7acc817580..2cb63eaa38 100644
--- a/src/paragraph_funcs.C
+++ b/src/paragraph_funcs.C
@@ -168,10 +168,11 @@ void breakParagraph(BufferParams const & bparams,
 		return;
 	}
 
-	par.params().clear();
-
-	par.layout(bparams.getLyXTextClass().defaultLayout());
-
+        if (!isempty) {
+                par.params().clear();
+                par.layout(bparams.getLyXTextClass().defaultLayout());
+        }
+        
 	// layout stays the same with latex-environments
 	if (flag) {
 		par.layout(tmp->layout());