Fix back-button behavior going back to render view