Check for window mode in some more places