fixes #10590 menu layout