Main window menu bar can not always be navigated using keyboard

Fix for "Main window menu bar can not always be navigated using keyboard".