Add proper clearing of popovers