diff --git a/jdk/src/solaris/classes/sun/awt/X11/XBaseWindow.java b/jdk/src/solaris/classes/sun/awt/X11/XBaseWindow.java
index 07a4fc7c265..0cd25523538 100644
--- a/jdk/src/solaris/classes/sun/awt/X11/XBaseWindow.java
+++ b/jdk/src/solaris/classes/sun/awt/X11/XBaseWindow.java
@@ -1000,10 +1000,7 @@ public class XBaseWindow {
         int buttonState = 0;
         final int buttonsNumber = ((SunToolkit)(Toolkit.getDefaultToolkit())).getNumberOfButtons();
         for (int i = 0; i<buttonsNumber; i++){
-            // A bug in WM implementation: extra buttons doesn't have state!=0 as they should on Release message.
-            if ((i != 4) && (i != 5)){
-                buttonState |= (xbe.get_state() & XConstants.buttonsMask[i]);
-            }
+            buttonState |= (xbe.get_state() & XConstants.buttonsMask[i]);
         }
         switch (xev.get_type()) {
         case XConstants.ButtonPress:
diff --git a/jdk/test/java/awt/event/MouseWheelEvent/DisabledComponent/DisabledComponent.java b/jdk/test/java/awt/event/MouseWheelEvent/DisabledComponent/DisabledComponent.java
new file mode 100644
index 00000000000..4a8da6f8e2d
--- /dev/null
+++ b/jdk/test/java/awt/event/MouseWheelEvent/DisabledComponent/DisabledComponent.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+  @test
+  @bug 6847958
+  @library ../../../regtesthelpers
+  @summary MouseWheel event is getting triggered for the disabled Textarea in jdk7 b60 pit build.
+  @author Dmitry Cherepanov: area=awt.event
+  @build Util
+  @run main DisabledComponent
+*/
+
+/**
+ * DisabledComponent.java
+ *
+ * summary: Tests that wheel events aren't coming on disabled component
+ */
+
+import java.awt.*;
+import java.awt.event.*;
+
+import sun.awt.SunToolkit;
+
+import test.java.awt.regtesthelpers.Util;
+
+public class DisabledComponent
+{
+
+    private static volatile boolean passed = true;
+
+    public static void main(String []s) throws Exception
+    {
+        Frame frame = new Frame();
+        frame.setBounds(100,100,400,400);
+        frame.setLayout(new FlowLayout());
+
+        TextArea textArea = new TextArea("TextArea", 6, 15);
+        frame.add(textArea);
+
+        List list = new List(3);
+        list.add("1");
+        list.add("2");
+        list.add("3");
+        frame.add(list);
+
+        MouseWheelListener listener = new MouseWheelListener(){
+            @Override
+                public void mouseWheelMoved(MouseWheelEvent mwe){
+                    System.err.println(mwe);
+                    passed = false;
+                }
+            };
+
+
+        list.addMouseWheelListener(listener);
+        textArea.addMouseWheelListener(listener);
+
+        frame.setVisible(true);
+        ((SunToolkit)Toolkit.getDefaultToolkit()).realSync();
+
+        Robot robot = new Robot();
+
+        // point and wheel on the list
+        Util.pointOnComp(list, robot);
+        ((SunToolkit)Toolkit.getDefaultToolkit()).realSync();
+
+        robot.mouseWheel(2);
+        ((SunToolkit)Toolkit.getDefaultToolkit()).realSync();
+
+        // disable the text area
+        System.err.println(" disable text area ");
+        textArea.setEnabled(false);
+        passed = true;
+
+        // point and wheel on the text area
+        Util.pointOnComp(textArea, robot);
+        ((SunToolkit)Toolkit.getDefaultToolkit()).realSync();
+
+        robot.mouseWheel(2);
+        ((SunToolkit)Toolkit.getDefaultToolkit()).realSync();
+
+        if (!passed) {
+            throw new RuntimeException(" wrong wheel events ");
+        }
+    }
+}