Quick fix for a UI race condition
Integrate race-condition quick fix.