Fixes incorrect post-edit scrolling

Fixes #268, broken in 2cd45be19162d

Post-edit scrolling can probably be smarter, but this fixes the brokenness.
Merge branch '3.0' into 4.0