Fix DropList replacement logic

Hold the replaced item while doing the actual transfer and add it to 
it's origin afterward. This way it can not be transfered after being 
moved back.