Quick fix for a UI race condition