diff --git a/Core/Dialog/PSPOskDialog.cpp b/Core/Dialog/PSPOskDialog.cpp
index a7380c510..f2d186c5a 100644
--- a/Core/Dialog/PSPOskDialog.cpp
+++ b/Core/Dialog/PSPOskDialog.cpp
@@ -183,10 +183,14 @@ void PSPOskDialog::Update()
 		else if (IsButtonPressed(CTRL_LEFT))
 		{
 			selectedChar--;
+			if (((selectedChar + KEYSPERROW) % KEYSPERROW) == KEYSPERROW - 1)
+				selectedChar += KEYSPERROW;
 		}
 		else if (IsButtonPressed(CTRL_RIGHT))
 		{
 			selectedChar++;
+			if ((selectedChar % KEYSPERROW) == 0)
+				selectedChar -= KEYSPERROW;
 		}
 
 		selectedChar = (selectedChar + NUMBEROFVALIDCHARS) % NUMBEROFVALIDCHARS;