Fix for Waiting view staying open