Fix highlight scrolling issues