Fix proper item hightlight