Re #8909. Moved drop processing outside the event handler