Remove flicker on item select