diff --git a/src/client/menu/qmenu.c b/src/client/menu/qmenu.c
index bac310c5e..92b8cd24f 100644
--- a/src/client/menu/qmenu.c
+++ b/src/client/menu/qmenu.c
@@ -291,6 +291,7 @@ Field_Key(menufield_s *f, int key)
 			}
 			break;
 
+		case K_KP_RIGHTARROW:
 		case K_RIGHTARROW:
 			if (f->buffer[f->cursor] != '\0')
 			{
@@ -306,6 +307,17 @@ Field_Key(menufield_s *f, int key)
 			}
 			break;
 
+		case K_END:
+			if (f->buffer[f->cursor] == '\0')
+			{
+				f->cursor = 0;
+			}
+			else
+			{
+				f->cursor = strlen(f->buffer);
+			}
+			break;
+
 		case K_KP_DEL:
 		case K_DEL:
 			if (f->buffer[f->cursor] != '\0')