Fixing current selection in menu