diff --git a/Perspex.Controls/TextBox.cs b/Perspex.Controls/TextBox.cs
index b9ae4bf980..d2d135a529 100644
--- a/Perspex.Controls/TextBox.cs
+++ b/Perspex.Controls/TextBox.cs
@@ -139,6 +139,7 @@ namespace Perspex.Controls
 
         private void MoveHome(ModifierKeys modifiers)
         {
+            var text = this.Text ?? string.Empty;
             var caretIndex = this.CaretIndex;
 
             if ((modifiers & ModifierKeys.Control) != 0)
@@ -152,7 +153,7 @@ namespace Perspex.Controls
 
                 foreach (var line in lines)
                 {
-                    if (pos + line.Length > caretIndex)
+                    if (pos + line.Length > caretIndex || pos + line.Length == text.Length)
                     {
                         break;
                     }
@@ -175,6 +176,50 @@ namespace Perspex.Controls
             }
         }
 
+        private void MoveEnd(ModifierKeys modifiers)
+        {
+            var text = this.Text ?? string.Empty;
+            var caretIndex = this.CaretIndex;
+
+            if ((modifiers & ModifierKeys.Control) != 0)
+            {
+                caretIndex = text.Length;
+            }
+            else
+            {
+                var lines = this.textBoxView.FormattedText.GetLines();
+                var pos = 0;
+
+                foreach (var line in lines)
+                {
+                    pos += line.Length;
+
+                    if (pos > caretIndex)
+                    {
+                        if (pos < text.Length)
+                        {
+                            --pos;
+                        }
+
+                        break;
+                    }
+                }
+
+                caretIndex = pos;
+            }
+
+            this.CaretIndex = caretIndex;
+
+            if ((modifiers & ModifierKeys.Shift) != 0)
+            {
+                this.SelectionEnd = caretIndex;
+            }
+            else
+            {
+                this.SelectionStart = this.SelectionEnd = caretIndex;
+            }
+        }
+
         private void OnKeyDown(object sender, KeyEventArgs e)
         {
             string text = this.Text ?? string.Empty;
@@ -204,7 +249,7 @@ namespace Perspex.Controls
                     break;
 
                 case Key.End:
-                    this.CaretIndex = text.Length;
+                    this.MoveEnd(e.Device.Modifiers);
                     break;
 
                 case Key.Delete: