Leak less memory, push to window stack only once