Fix for issue #57 - stop spinner when going back