move fallback cmd menu handling to a more sensical place