diff --git a/src/core/ControllerConfig.cpp b/src/core/ControllerConfig.cpp
index b94e95cd..30930a78 100644
--- a/src/core/ControllerConfig.cpp
+++ b/src/core/ControllerConfig.cpp
@@ -1355,7 +1355,7 @@ bool CControllerConfigManager::GetIsKeyboardKeyJustDown(RsKeyCodes keycode)
 			return true;
 		break;
 	case rsENTER:
-		if (CPad::GetPad(PAD1)->GetEnterJustDown())
+		if (CPad::GetPad(PAD1)->GetReturnJustDown())
 			return true;
 		break;
 	case rsLSHIFT:
diff --git a/src/core/CutsceneMgr.cpp b/src/core/CutsceneMgr.cpp
index f147e8c9..fa322242 100644
--- a/src/core/CutsceneMgr.cpp
+++ b/src/core/CutsceneMgr.cpp
@@ -411,7 +411,7 @@ CCutsceneMgr::Update(void)
 		if (CPad::GetPad(0)->GetCrossJustDown()
 			|| (CGame::playingIntro && CPad::GetPad(0)->GetStartJustDown())
 			|| CPad::GetPad(0)->GetLeftMouseJustDown()
-			|| CPad::GetPad(0)->GetPadEnterJustDown() || CPad::GetPad(0)->GetEnterJustDown() // NOTE: In original code it's a single CPad method
+			|| CPad::GetPad(0)->GetEnterJustDown()
 			|| CPad::GetPad(0)->GetCharJustDown(VK_SPACE))
 			FinishCutscene();
 	}
diff --git a/src/core/Pad.cpp b/src/core/Pad.cpp
index f334a255..e5178ef3 100644
--- a/src/core/Pad.cpp
+++ b/src/core/Pad.cpp
@@ -1855,7 +1855,7 @@ char *CPad::EditString(char *pStr, int32 nSize)
 	}
 
 	// extenter/up/down
-	if ( GetPad(0)->GetEnterJustDown() || GetPad(0)->GetUpJustDown() || GetPad(0)->GetDownJustDown() )
+	if ( GetPad(0)->GetReturnJustDown() || GetPad(0)->GetUpJustDown() || GetPad(0)->GetDownJustDown() )
 		return nil;
 	
 	return pStr;
@@ -1976,7 +1976,7 @@ int32 *CPad::EditCodesForControls(int32 *pRsKeys, int32 nSize)
 	if ( GetPad(0)->GetCapsLockJustDown() )
 		*pRsKeys = rsCAPSLK;
 	
-	if ( GetPad(0)->GetEnterJustDown() )
+	if ( GetPad(0)->GetReturnJustDown() )
 		*pRsKeys = rsENTER;
 	
 	if ( GetPad(0)->GetLeftShiftJustDown() )
diff --git a/src/core/Pad.h b/src/core/Pad.h
index e1223629..89ec4aa2 100644
--- a/src/core/Pad.h
+++ b/src/core/Pad.h
@@ -299,7 +299,7 @@ public:
 	bool GetTimesJustDown()       { return !!(NewKeyState.MUL && !OldKeyState.MUL); }
 	bool GetMinusJustDown()       { return !!(NewKeyState.SUB && !OldKeyState.SUB); }
 	bool GetPlusJustDown()        { return !!(NewKeyState.ADD && !OldKeyState.ADD); }
-	bool GetPadEnterJustDown()    { return !!(NewKeyState.ENTER && !OldKeyState.ENTER); } //  GetEnterJustDown
+	bool GetPadEnterJustDown()    { return !!(NewKeyState.ENTER && !OldKeyState.ENTER); }
 	bool GetPadDelJustDown()      { return !!(NewKeyState.DECIMAL && !OldKeyState.DECIMAL); }
 	bool GetPad1JustDown()        { return !!(NewKeyState.NUM1 && !OldKeyState.NUM1); }
 	bool GetPad2JustDown()        { return !!(NewKeyState.NUM2 && !OldKeyState.NUM2); }
@@ -314,7 +314,7 @@ public:
 	bool GetBackspaceJustDown()   { return !!(NewKeyState.BACKSP && !OldKeyState.BACKSP); }
 	bool GetTabJustDown()         { return !!(NewKeyState.TAB && !OldKeyState.TAB); }
 	bool GetCapsLockJustDown()    { return !!(NewKeyState.CAPSLOCK && !OldKeyState.CAPSLOCK); }
-	bool GetEnterJustDown()       { return !!(NewKeyState.EXTENTER && !OldKeyState.EXTENTER); }
+	bool GetReturnJustDown()       { return !!(NewKeyState.EXTENTER && !OldKeyState.EXTENTER); }
 	bool GetLeftShiftJustDown()   { return !!(NewKeyState.LSHIFT && !OldKeyState.LSHIFT); }
 	bool GetShiftJustDown()       { return !!(NewKeyState.SHIFT && !OldKeyState.SHIFT); }
 	bool GetRightShiftJustDown()  { return !!(NewKeyState.RSHIFT && !OldKeyState.RSHIFT); }
@@ -325,6 +325,8 @@ public:
 	bool GetLeftWinJustDown()     { return !!(NewKeyState.LWIN && !OldKeyState.LWIN); }
 	bool GetRightWinJustDown()    { return !!(NewKeyState.RWIN && !OldKeyState.RWIN); }
 	bool GetAppsJustDown()        { return !!(NewKeyState.APPS && !OldKeyState.APPS); }
+	bool GetEnterJustDown()       { return GetPadEnterJustDown() || GetReturnJustDown(); }
+	bool GetAltJustDown()         { return GetLeftAltJustDown() || GetRightAltJustDown(); }
 								  
 	bool GetChar(int32 c)         { return NewKeyState.VK_KEYS[c]; }
 	bool GetF(int32 n)            { return NewKeyState.F[n]; }
diff --git a/src/skel/win/win.cpp b/src/skel/win/win.cpp
index 89726ed2..5b328d03 100644
--- a/src/skel/win/win.cpp
+++ b/src/skel/win/win.cpp
@@ -1969,11 +1969,11 @@ _WinMain(HINSTANCE instance,
 							++gGameState;
 						else if ( CPad::GetPad(0)->GetLeftMouseJustDown() )
 							++gGameState;
-						else if ( CPad::GetPad(0)->GetPadEnterJustDown() || CPad::GetPad(0)->GetEnterJustDown() )
+						else if ( CPad::GetPad(0)->GetEnterJustDown() )
 							++gGameState;
-						else if ( CPad::GetPad(0)->GetCharJustDown(' ') )
+						else if ( CPad::GetPad(0)->GetCharJustDown(VK_SPACE) )
 							++gGameState;
-						else if ( CPad::GetPad(0)->GetLeftAltJustDown() || CPad::GetPad(0)->GetRightAltJustDown() )
+						else if ( CPad::GetPad(0)->GetAltJustDown() )
 							++gGameState;
 						else if ( CPad::GetPad(0)->GetTabJustDown() )
 							++gGameState;
@@ -2005,11 +2005,11 @@ _WinMain(HINSTANCE instance,
 							++gGameState;
 						else if ( CPad::GetPad(0)->GetLeftMouseJustDown() )
 							++gGameState;
-						else if ( CPad::GetPad(0)->GetPadEnterJustDown() || CPad::GetPad(0)->GetEnterJustDown() )
+						else if ( CPad::GetPad(0)->GetEnterJustDown() )
 							++gGameState;
-						else if ( CPad::GetPad(0)->GetCharJustDown(' ') )
+						else if ( CPad::GetPad(0)->GetCharJustDown(VK_SPACE) )
 							++gGameState;
-						else if ( CPad::GetPad(0)->GetLeftAltJustDown() || CPad::GetPad(0)->GetRightAltJustDown() )
+						else if ( CPad::GetPad(0)->GetAltJustDown() )
 							++gGameState;
 						else if ( CPad::GetPad(0)->GetTabJustDown() )
 							++gGameState;