1 files changed, 4 insertions, 3 deletions
diff --git a/libjava/classpath/javax/swing/JButton.java b/libjava/classpath/javax/swing/JButton.java
index 5653fbf42f1..ff0ecfccfd4 100644
--- a/libjava/classpath/javax/swing/JButton.java
+++ b/libjava/classpath/javax/swing/JButton.java
@@ -75,9 +75,6 @@ public class JButton extends AbstractButton
   boolean def;
   boolean is_def;
 
-  /** The AccessibleContext for this JButton. */
-  AccessibleJButton accessibleContext;
-
   public JButton()
   {
     this(null, null);
@@ -166,6 +163,10 @@ public class JButton extends AbstractButton
    */
   public void removeNotify()
   {
+    JRootPane root = SwingUtilities.getRootPane(this);
+    if (root != null && root.getDefaultButton() == this)
+      root.setDefaultButton(null);
+    super.removeNotify();
   }
 
   public void setDefaultCapable(boolean defaultCapable)