Fixed flickering on selection