See #1257 - fixed key handling / scrolling / loading