This works for most menus but not Window menu. It will be great if you can find out why. Otherwise, I'm ok to merge with this exception.