--- old/src/share/classes/java/awt/DefaultKeyboardFocusManager.java 2013-05-20 17:17:38.000000000 +0400 +++ new/src/share/classes/java/awt/DefaultKeyboardFocusManager.java 2013-05-20 17:17:37.000000000 +0400 @@ -558,7 +558,8 @@ restoreFocus(fe, currentFocusedWindow); } else { restoreFocus(fe, newFocusedWindow); - } + } + setMostRecentFocusOwner(newFocusedWindow, null); // see: 8013773 } break; }