diff --git a/src/itdelatrisu/opsu/Options.java b/src/itdelatrisu/opsu/Options.java
index ddd4ecda..011d4de1 100644
--- a/src/itdelatrisu/opsu/Options.java
+++ b/src/itdelatrisu/opsu/Options.java
@@ -935,20 +935,14 @@ public class Options {
 						GameOption.DISABLE_SOUNDS.setValue(Boolean.parseBoolean(value));
 						break;
 					case "keyOsuLeft":
-						if ((value.length() == 1 && Character.isLetterOrDigit(value.charAt(0))) ||
-							(value.length() == 7 && value.startsWith("NUMPAD"))) {
-							i = Keyboard.getKeyIndex(value);
-							if (keyRight != i)
-								keyLeft = i;
-						}
+						i = Keyboard.getKeyIndex(value);
+						if (keyRight != i)
+							keyLeft = i;
 						break;
 					case "keyOsuRight":
-						if ((value.length() == 1 && Character.isLetterOrDigit(value.charAt(0))) ||
-							(value.length() == 7 && value.startsWith("NUMPAD"))) {
-							i = Keyboard.getKeyIndex(value);
-							if (keyLeft != i)
-								keyRight = i;
-						}
+						i = Keyboard.getKeyIndex(value);
+						if (keyLeft != i)
+							keyRight = i;
 						break;
 					case "MouseDisableWheel":
 						GameOption.DISABLE_MOUSE_WHEEL.setValue(Boolean.parseBoolean(value));
diff --git a/src/itdelatrisu/opsu/states/OptionsMenu.java b/src/itdelatrisu/opsu/states/OptionsMenu.java
index ad49b813..746e04e9 100644
--- a/src/itdelatrisu/opsu/states/OptionsMenu.java
+++ b/src/itdelatrisu/opsu/states/OptionsMenu.java
@@ -243,9 +243,17 @@ public class OptionsMenu extends BasicGameState {
 			g.setColor(Utils.COLOR_BLACK_ALPHA);
 			g.fillRect(0, 0, width, height);
 			g.setColor(Color.white);
+
+			String prompt;
+			if (keyEntryLeft) {
+				prompt = "Please press the new left-click key";
+			} else {
+				prompt = "Please press the new right-click key";
+			}
+
 			Utils.FONT_LARGE.drawString(
-					(width / 2) - (Utils.FONT_LARGE.getWidth("Please enter a letter or digit.") / 2),
-					(height / 2) - Utils.FONT_LARGE.getLineHeight(), "Please enter a letter or digit."
+					(width / 2) - (Utils.FONT_LARGE.getWidth(prompt) / 2),
+					(height / 2) - Utils.FONT_LARGE.getLineHeight(), prompt
 			);
 		}
 
@@ -339,12 +347,10 @@ public class OptionsMenu extends BasicGameState {
 	public void keyPressed(int key, char c) {
 		// key entry state
 		if (keyEntryLeft || keyEntryRight) {
-			if (Character.isLetterOrDigit(c)) {
-				if (keyEntryLeft && Options.getGameKeyRight() != key)
-					Options.setGameKeyLeft(key);
-				else if (keyEntryRight && Options.getGameKeyLeft() != key)
-					Options.setGameKeyRight(key);
-			}
+			if (keyEntryLeft && Options.getGameKeyRight() != key)
+				Options.setGameKeyLeft(key);
+			else if (keyEntryRight && Options.getGameKeyLeft() != key)
+				Options.setGameKeyRight(key);
 			keyEntryLeft = keyEntryRight = false;
 			return;
 		}