Fixed popover behavior

@spencereldred