Added support for the gadget popup