Unstaged files pane is not a stable view when in tree view

When clicking the checkbox in "Unstaged files" pane, the item is added to "Staged files". That is fine. The problem is the Unstaged view is reset, seemingly randomly, so that one must scroll back to the same area of the list (I'm using a tree view) to select adjacent files.

It should not require scrolling to get back the the view. It should work as it does in flat list view mode.