diff --git a/src/kits/interface/TextView.cpp b/src/kits/interface/TextView.cpp
index 34f8b319dc..99fc0ef923 100644
--- a/src/kits/interface/TextView.cpp
+++ b/src/kits/interface/TextView.cpp
@@ -1949,7 +1949,9 @@ BTextView::CanEndLine(int32 offset)
 {
 	// TODO: This should be improved using the LocaleKit.
 	uint32 classification = _CharClassification(offset);
-	if (classification == CHAR_CLASS_END_OF_TEXT)
+
+	// wrapping is always allowed at end of text and at newlines
+	if (classification == CHAR_CLASS_END_OF_TEXT || ByteAt(offset) == B_ENTER)
 		return true;
 
 	uint32 nextClassification = _CharClassification(offset + 1);