Changed singleton window behaviour