SearchPopup is modal now
Add missing tokens to UITokens