diff --git a/src/Text.cpp b/src/Text.cpp
index a47d4b1c52..a6176bc08a 100644
--- a/src/Text.cpp
+++ b/src/Text.cpp
@@ -769,7 +769,8 @@ void Text::breakParagraph(Cursor & cur, bool inverse_logic)
 		else {
 			docstring const & lay = cur.paragraph().usePlainLayout()
 			    ? tclass.plainLayoutName() : tclass.defaultLayoutName();
-			setLayout(cur, lay);
+			if (lay != layout.name())
+				setLayout(cur, lay);
 		}
 		return;
 	}
diff --git a/status.22x b/status.22x
index f4bc1bc68d..1ad21c346a 100644
--- a/status.22x
+++ b/status.22x
@@ -106,6 +106,8 @@ What's new
 
 - Fix the minimum size of the citation dialog on first time (bug 10019).
 
+- When Enter does nothing (empty paragraph), do not record undo (bug 10089).
+
 
 * INTERNALS