--- old/src/java.desktop/share/classes/java/awt/DefaultKeyboardFocusManager.java	2016-02-25 16:23:52.201848999 +0530
+++ new/src/java.desktop/share/classes/java/awt/DefaultKeyboardFocusManager.java	2016-02-25 16:23:52.049773000 +0530
@@ -355,6 +355,12 @@
                         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