Just thinking at the keyboard here: if I'm reading that right, Esc won't close the main menu, leading to the same annoyance as when it didn't close the debug menu.  If so, worth fixing that?