CM: add wait-for-popup