Fix bug in popover stack