fix handling of programmatic popup nav