fix #12007 by clarifying target of dropdown events
Merge branch 'address-12007'