WIP - we may possibly need to prevent popovers from going away