Improve drag-and-drop performance and be more robust to race conditions