diff --git a/src/Row.cpp b/src/Row.cpp
index d7940e92e9..86b7d06ce6 100644
--- a/src/Row.cpp
+++ b/src/Row.cpp
@@ -86,10 +86,12 @@ pos_type Row::Element::x2pos(double &x, bool const low) const
 		// 	lyxerr << " NOT FOUND ";
 	}
 
-	if (i == str.size())
+	if (type == STRING && i == str.size())
 		x2 = w;
-	// round to the closest side
-	else if (!low && (x2 - last_w > w - x2)) {
+	// round to the closest side. The !rtl is here to obtain the
+	// same rounding as with the old code (this is cosmetic and
+	// can be eventually removed).
+	else if (!low && (x2 - last_w + !rtl > w - x2)) {
 		x2 = w;
 		++i;
 	} else