[#50928529] refined behavior of menu