fixes: [#71343898] Prevent navigating to next activity

https://www.pivotaltracker.com/story/show/71343898