I'm still facing this issue in the 3.1.4 release. I think this is an UX bug. It's very annoying to have to scroll back to the line I was after switching from the view mode to the editor mode.