Firefox-proofing the menu navigation.
Merge pull request #1109 from mfalesni/firefox-proofing

Firefox-proofing the menu navigation.