Fix potential breakage of drag-and-drop on heavy operations