Fix recently introduced component dragging issue