diff --git a/WPrefs.app/KeyboardShortcuts.c b/WPrefs.app/KeyboardShortcuts.c
index 88e33788..52c395e9 100644
--- a/WPrefs.app/KeyboardShortcuts.c
+++ b/WPrefs.app/KeyboardShortcuts.c
@@ -320,7 +320,7 @@ char *capture_shortcut(Display *dpy, Bool *capturing, Bool convert_case)
 				/* conditional mask check to get numeric keypad keys */
 				ksym = XkbKeycodeToKeysym(dpy, ev.xkey.keycode, 0, ev.xkey.state & numlock_mask?1:0);
 			else
-				ksym = XKeycodeToKeysym(dpy, ev.xkey.keycode, 0);
+				ksym = XKeycodeToKeysym(dpy, ev.xkey.keycode, ev.xkey.state & numlock_mask?1:0);
 
 			if (!IsModifierKey(ksym)) {
 				if (convert_case) {
diff --git a/WPrefs.app/MouseSettings.c b/WPrefs.app/MouseSettings.c
index bf9696da..497005dd 100644
--- a/WPrefs.app/MouseSettings.c
+++ b/WPrefs.app/MouseSettings.c
@@ -384,7 +384,7 @@ static void fillModifierPopUp(WMPopUpButton * pop)
 					if (xext_xkb_supported)
 						ksym = XkbKeycodeToKeysym(dpy, mapping->modifiermap[idx], 0, l);
 					else
-						ksym = XKeycodeToKeysym(dpy, mapping->modifiermap[idx], 0);
+						ksym = XKeycodeToKeysym(dpy, mapping->modifiermap[idx], l);
 					if (ksym != NoSymbol)
 						break;
 				}