diff --git a/Terminal.Gui/Views/TextField.cs b/Terminal.Gui/Views/TextField.cs
index 42ede30e0..860b7a246 100644
--- a/Terminal.Gui/Views/TextField.cs
+++ b/Terminal.Gui/Views/TextField.cs
@@ -176,7 +176,7 @@ namespace Terminal.Gui {
 		int RuneIndexToByteIndex (int index)
 		{
 			var blen = text.Length;
-			for (int byteIndex = 0, runeIndex = 0; byteIndex < blen; runeIndex++) {
+			for (int byteIndex = 0, runeIndex = 0; byteIndex <= blen; runeIndex++) {
 				if (index == runeIndex)
 					return byteIndex;
 				(var rune, var size) = Utf8.DecodeRune (text, byteIndex, byteIndex - blen);