Added closing on Escape