improve popovers behaviour