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

Minor improvement to already committed functionality.