Add focus to menu only if it comes from a keyboard shortcut

This removes the focus that was occurring when using a mouse and now only adds it if the keyboard shortcut is used.

This should help resolve any issues you had with the focus and the highlight.