diff --git a/project/src/common/TextField.cpp b/project/src/common/TextField.cpp
index d83559eaf..43c2a22a6 100644
--- a/project/src/common/TextField.cpp
+++ b/project/src/common/TextField.cpp
@@ -511,7 +511,7 @@ int TextField::PointToChar(UserPoint inPoint) const
       if ( (line.mY0+line.mMetrics.height) > inPoint.y && line.mChars)
       {
          if (line.mChars==1)
-            return line.mChar0;
+            return line.mChar0 + (inPoint.x>mCharPos[line.mChar0 + 1].x);
 
          // Find the char
          for(int c=0; c<line.mChars;c++)