Index: NbFocusManager.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/windows/frames/NbFocusManager.java,v
retrieving revision 1.20.2.5
diff -u -r1.20.2.5 NbFocusManager.java
--- NbFocusManager.java	22 Jan 2002 15:48:37 -0000	1.20.2.5
+++ NbFocusManager.java	28 Jan 2002 13:24:09 -0000
@@ -141,15 +141,16 @@
 
         pendingEvents.add (ev);
 
-        // if we are not inside the MDI main window and there is an opened menu
-        // popup, then send the KeyEvent to the popup.  However combobox popup
-        // is also considered a menu popup, in this case we must not redirect
-        // the event
+        // route keyevent if this is a popup menu or this is a pulldown menu
+        // and we are not in MDI.  Note that ComboPopup is also handled by
+        // MenuSelectionManager, we must avoid routing in that case.
 
         Window w = SwingUtilities.windowForComponent(ev.getComponent ());
         JFrame mw = WindowManagerImpl.mainWindow();
         
-        if (mw != w && (elems != null) && (elems.length > 0)) {
+        if (elems != null && elems.length > 0
+            && (mw != w || !(elems[0] instanceof JMenuBar))
+            ) {
             if (!(elems[0].getComponent() instanceof ComboPopup)
                 ) {
                 for (int i = elems.length; --i >= 0 && !ev.isConsumed(); ) {