Fix menu selection bug