diff --git a/OpenRA.Game/Widgets/TextFieldWidget.cs b/OpenRA.Game/Widgets/TextFieldWidget.cs
index 1ec7261430..46a6832e41 100644
--- a/OpenRA.Game/Widgets/TextFieldWidget.cs
+++ b/OpenRA.Game/Widgets/TextFieldWidget.cs
@@ -116,6 +116,18 @@ namespace OpenRA.Widgets
 
 				return true;
 			}
+			
+			if (e.KeyName == "home")
+			{
+				CursorPosition = 0;
+				return true;
+			}
+			
+			if (e.KeyName == "end")
+			{
+				CursorPosition = Text.Length;
+				return true;
+			}
 
 			if (e.KeyName == "delete")
 			{