Enhance OS X menu version

Should fix #1082