CON-1654 | Handle opening new windows