diff --git a/source/blender/blenfont/intern/blf_font.cc b/source/blender/blenfont/intern/blf_font.cc
index 8ff80df77ec..01fee5c21e5 100644
--- a/source/blender/blenfont/intern/blf_font.cc
+++ b/source/blender/blenfont/intern/blf_font.cc
@@ -1025,6 +1025,9 @@ size_t blf_str_offset_from_cursor_position(FontBLF *font,
                                            size_t str_len,
                                            int location_x)
 {
+  /* Do not early exit if location_x <= 0, as this can result in an incorrect
+   * offset for RTL text. Instead of offset of character responsible for first
+   * glyph you'd get offset of first character, which could be the last glyph. */
   if (!str || !str[0] || !str_len) {
     return 0;
   }
@@ -1033,10 +1036,6 @@ size_t blf_str_offset_from_cursor_position(FontBLF *font,
   data.location_x = location_x;
   data.r_offset = size_t(-1);
 
-  /* For negative position, don't early exit with 0 but instead test as
-   * if it were zero. First glyph might not be from first character. */
-  location_x = std::max(location_x, 0);
-
   blf_font_boundbox_foreach_glyph(font, str, str_len, blf_cursor_position_foreach_glyph, &data);
 
   if (data.r_offset == size_t(-1)) {