Fix add window