Fixed issue where all input was deleted

In an attempt to fix the scroll issue, I introduced a new bug where all
input was being erased.  Fixed the scroll issue and the deleted input
issue.
Merge branch 'master' into gh-pages