Fixed keyboard selection bug