Fix highlight scrolling issues
Merge pull request #383 from afarra/master

Fix highlight scrolling issues