Fix: avoid unnecessary scrolling
Merge pull request #501 from david0/issue-499

Fix: avoid unnecessary scrolling