From 88cfd14ce543779adfbd7b842e0dd8997edd26b5 Mon Sep 17 00:00:00 2001
From: Aaron van Geffen <aaron@aaronweb.net>
Date: Fri, 23 Feb 2018 15:04:51 +0100
Subject: [PATCH] Fix #7020: end key not working in text input.

---
 src/openrct2-ui/TextComposition.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/openrct2-ui/TextComposition.cpp b/src/openrct2-ui/TextComposition.cpp
index 4de4194293..cf2868bb7d 100644
--- a/src/openrct2-ui/TextComposition.cpp
+++ b/src/openrct2-ui/TextComposition.cpp
@@ -194,7 +194,15 @@ void TextComposition::CursorHome()
 
 void TextComposition::CursorEnd()
 {
-    _session.SelectionStart = _session.SelectionSize;
+    size_t selectionOffset = _session.Size;
+    const utf8 * ch = _session.Buffer + _session.SelectionStart;
+    while (!utf8_is_codepoint_start(ch) && selectionOffset > 0)
+    {
+        ch--;
+        selectionOffset--;
+    }
+
+    _session.SelectionStart = selectionOffset;
 }
 
 void TextComposition::CursorLeft()