Fix ordering issues when with_menu(None) is called before setting the window builder

Fix ordering issues when with_menu(None) is called before setting the window builder #6828