src/java.desktop/share/classes/java/awt/DefaultKeyboardFocusManager.java

*** 354,363 ****
--- 354,369 ----
                          setGlobalFocusOwner(null);
                          setGlobalFocusedWindow(null);
                      }
                  }
                  
+                 Component comp = KeyboardFocusManager.
+                         getMostRecentFocusOwner(newFocusedWindow);
+                 if (comp != null) {
+                     setGlobalFocusOwner(comp);
+                 }
+ 
                  // Because the native libraries do not post WINDOW_ACTIVATED
                  // events, we need to synthesize one if the active Window
                  // changed.
                  Window newActiveWindow =
                      getOwningFrameDialog(newFocusedWindow);