Fix menu spacing

Replace of #8526.
I hope this is fix bug in every build.