Pass triggering element, not the icon
Close button instead of unfocus code