diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindow.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindow.java index 929e0de36..28dffb24d 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindow.java +++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindow.java @@ -1258,11 +1258,18 @@ public boolean dispatchKeyEvent(KeyEvent e) if(getCurrentChat() == null) return false; - + ChatWritePanel chatWritePanel = getCurrentChat().getChatWritePanel(); JEditorPane chatWriteEditor = chatWritePanel.getEditorPane(); + // Don't re-dispatch any events if the menu is active. Fixes the + // navigation in the menu. + if (menuBar.isSelected()) + { + return false; + } + if (keyManager.getFocusOwner() != null && !chatWritePanel.isFocusOwner()) {