Fixed two minor issues in the drag-drop logic
Authored by: numere 2017-05-06
Parent: [r101]
Child: [r103]