New Popup form style, Fixes #5931