--- old/src/macosx/classes/sun/lwawt/LWComponentPeer.java 2012-08-31 15:36:50.000000000 +0400 +++ new/src/macosx/classes/sun/lwawt/LWComponentPeer.java 2012-08-31 15:36:49.000000000 +0400 @@ -1248,12 +1248,9 @@ protected void handleJavaMouseEvent(MouseEvent e) { Component target = getTarget(); assert (e.getSource() == target); - + if (!target.isFocusOwner() && LWKeyboardFocusManagerPeer.shouldFocusOnClick(target)) { LWKeyboardFocusManagerPeer.requestFocusFor(target, CausedFocusEvent.Cause.MOUSE_EVENT); - } else { - // Anyway request focus to the toplevel. - getWindowPeerOrSelf().requestWindowFocus(CausedFocusEvent.Cause.MOUSE_EVENT); } }