--- a/jdk/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java	Fri Apr 12 20:39:48 2013 +0400
+++ b/jdk/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java	Mon Apr 15 13:02:31 2013 +0400
@@ -1182,8 +1182,8 @@
                             "\nKFM's focused window: " + focusedWindow);
             }
 
-            // See 6522725, 6613426.
-            if (target == realNativeFocusedWindow) {
+            // A workaround for Metacity. See 6522725, 6613426, 7147075.
+            if (target == realNativeFocusedWindow && XWM.getWMID() == XWM.METACITY_WM) {
                 if (focusLog.isLoggable(PlatformLogger.FINE)) {
                     focusLog.fine("The window is already natively focused.");
                 }