Revert menu.c @ ae04663aa9

This caused a few bugs such as improperly setting away/back
and redrawing the channel tree when the menu is opened.