Fix popover support for simple mode