Same window open/close fixes