diff --git a/modules/juce_gui_basics/widgets/juce_TextEditor.cpp b/modules/juce_gui_basics/widgets/juce_TextEditor.cpp
index 416076aaa1..a5d0acf90a 100644
--- a/modules/juce_gui_basics/widgets/juce_TextEditor.cpp
+++ b/modules/juce_gui_basics/widgets/juce_TextEditor.cpp
@@ -1504,8 +1504,8 @@ void TextEditor::moveCaretTo (const int newPosition, const bool isSelecting)
 
 int TextEditor::getTextIndexAt (const int x, const int y)
 {
-    return indexAtPosition ((float) (x + viewport->getViewPositionX() - leftIndent),
-                            (float) (y + viewport->getViewPositionY() - topIndent));
+    return indexAtPosition ((float) (x + viewport->getViewPositionX() - leftIndent - borderSize.getLeft()),
+                            (float) (y + viewport->getViewPositionY() - topIndent  - borderSize.getTop()));
 }
 
 void TextEditor::insertTextAtCaret (const String& t)