SOAP-752: Now using the same popup as query editor