current selection when switching views

This reverts commit 05f82f43566364722a1594238161aadaa551da07.
The bug requires a more complex fix.