Fix drag and drop by adding the listeners in the right place.