diff --git a/src/share/classes/javax/swing/text/GlyphPainter2.java b/src/share/classes/javax/swing/text/GlyphPainter2.java
index 1e5403defe82ed3bc35f645f03061115a473b512..8b27ec93e4d693adf5c76939084ce768ccf928f3 100644
--- a/src/share/classes/javax/swing/text/GlyphPainter2.java
+++ b/src/share/classes/javax/swing/text/GlyphPainter2.java
@@ -172,6 +172,11 @@ class GlyphPainter2 extends GlyphView.GlyphPainter {
         //italic carets and we do not.
         TextHitInfo hit = layout.hitTestChar(x - (float)alloc.getX(), 0);
         int pos = hit.getInsertionIndex();
+
+        if (pos == v.getEndOffset()) {
+            pos--;
+        }
+
         biasReturn[0] = hit.isLeadingEdge() ? Position.Bias.Forward : Position.Bias.Backward;
         return pos + v.getStartOffset();
     }