Fixed bug where old window was not correctly made first responder again