Merchant windows should close correclty now