Fixed some unexpected behavior with save on drop event