fix #6587 Correctly order "Window" menu