Keep track of the view, not the window

- [GH-91]