Allow Menu and Window to play well together

See title