Fixed scrolling with keyboard selection

Equivalent to mleibman merge of pull request #658 on Jun 27, 2013