diff --git a/src/Text.cpp b/src/Text.cpp
index 46a6d7dd23..0a524ec9f7 100644
--- a/src/Text.cpp
+++ b/src/Text.cpp
@@ -542,7 +542,8 @@ void Text::insertChar(Cursor & cur, char_type c)
 	cur.checkBufferStructure();
 
 //		cur.updateFlags(Update::Force);
-	bool boundary = tm.isRTLBoundary(cur.pit(), cur.pos() + 1);
+	bool const boundary = cur.boundary()
+		|| tm.isRTLBoundary(cur.pit(), cur.pos() + 1);
 	setCursor(cur, cur.pit(), cur.pos() + 1, false, boundary);
 	charInserted(cur);
 }