Added a check for the WindowState to each Window related property