diff --git a/src/juce_appframework/gui/components/controls/juce_TextEditor.cpp b/src/juce_appframework/gui/components/controls/juce_TextEditor.cpp
index 3c95dfa42c..6ca27abf0d 100644
--- a/src/juce_appframework/gui/components/controls/juce_TextEditor.cpp
+++ b/src/juce_appframework/gui/components/controls/juce_TextEditor.cpp
@@ -2383,7 +2383,7 @@ int TextEditor::findWordBreakBefore (const int position) const throw()
     if (position <= 0)
         return 0;
 
-    const int startOfBuffer = position - jmin (512, position);
+    const int startOfBuffer = jmax (0, position - 512);
     const String t (getTextSubstring (startOfBuffer, position));
 
     int i = position - startOfBuffer;