Fix #3: The current view is not restored - part II