Moved the keypress off of id