Issue #2199997 by sylus: Improve the whole menu workflow.