Cancelling incremental search does not reset screen position

Currently, it's possible to cancel an ongoing incremental search by hitting the escape key, which returns the cursor to the position it was before the incremental search started. This is fantastic, and much used functionality.

However, unfortunately, while the cursor position is reset, it seems the scroll position is not, so most often the active line ends up being right at the top of the screen regardless of where it was before. This is not cool, as it results in a loss of context and is pretty disorientating.

It would be great if this could be fixed.