WIP Fix flickering on selection