* Fix loading indicator not appearing when cancelling and returning to target selection