Keep it working with new system window stuff.