--- old/src/solaris/classes/sun/awt/X11/XBaseWindow.java	2014-10-30 19:49:09.000000000 +0300
+++ new/src/solaris/classes/sun/awt/X11/XBaseWindow.java	2014-10-30 19:49:08.000000000 +0300
@@ -1001,6 +1001,13 @@
         switch (xev.get_type()) {
         case XConstants.ButtonPress:
             if (buttonState == 0) {
+                XWindowPeer parent = getToplevelXWindow();
+                // See 6385277, 6981400.
+                if (parent != null && parent.isFocusableWindow()) {
+                    // A click in a client area drops the actual focused window retaining.
+                    parent.setActualFocusedWindow(null);
+                    parent.requestWindowFocus(xbe.get_time(), true);
+                }
                 XAwtState.setAutoGrabWindow(this);
             }
             break;