diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp
index 6fca429b5a..8a18dd2956 100644
--- a/src/TextMetrics.cpp
+++ b/src/TextMetrics.cpp
@@ -322,16 +322,12 @@ bool TextMetrics::isRTLBoundary(pit_type pit, pos_type pos) const
 bool TextMetrics::isRTLBoundary(pit_type pit, pos_type pos,
 		Font const & font) const
 {
-	if (!lyxrc.rtl_support)
-		return false;
-
-	// no RTL boundary at paragraph start
-	if (pos == 0)
-		return false;
-
-	// if the metrics have not been calculated, then we are not
-	// on screen and can safely ignore issues about boundaries.
-	if (!contains(pit))
+	if (!lyxrc.rtl_support
+	    // no RTL boundary at paragraph start
+	    || pos == 0
+	    // if the metrics have not been calculated, then we are not
+	    // on screen and can safely ignore issues about boundaries.
+	    || !contains(pit))
 		return false;
 
 	ParagraphMetrics & pm = par_metrics_[pit];