Fixed issue with unwanted deselect on right click and issue with position jumping around when scrolling