The modalPopup use has been fixed in https://github.com/xwiki/xwiki-platform/commit/e28db6028adb17484fa057239dd55c15b494dc58 already