Fix navigate-away check and volume creation