Fix 2 shortcut bugs, one in Web+, one in S&T

It's really 2 instances of the same bug, we only want to consider a
fixed set of modifier keys ignoring the lock keys and left/right keys.