Fix drag-n-drop after folder move/create (#1489648)