diff --git a/source/gui/CInput.cpp b/source/gui/CInput.cpp
index af9fed897e..3025b52034 100644
--- a/source/gui/CInput.cpp
+++ b/source/gui/CInput.cpp
@@ -393,7 +393,8 @@ InReaction CInput::ManuallyHandleEvent(const SDL_Event_* ev)
 				break;
 			/* END: Message History Lookup */
 
-			case '\r':
+			case SDLK_KP_ENTER:
+			case SDLK_RETURN:
 				// 'Return' should do a Press event for single liners (e.g. submitting forms)
 				//  otherwise a '\n' character will be added.
 				{