Add support for popup window