diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 1f8e835c781..ae7ea57f8fd 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-25  Tom Tromey  <tromey@redhat.com>
+
+	* java/awt/Component.java (processEvent): Check ComponentEvent
+	after KeyEvent.
+
 2002-03-24  Bryce McKinlay  <bryce@waitaki.otago.ac.nz>
 
 	* java/io/PushbackReader.java: Reformat.
diff --git a/libjava/java/awt/Component.java b/libjava/java/awt/Component.java
index 034390cb6c4..9ea43edb1f1 100644
--- a/libjava/java/awt/Component.java
+++ b/libjava/java/awt/Component.java
@@ -1858,12 +1858,12 @@ public abstract class Component implements ImageObserver, MenuContainer,
 	else
 	  processMouseEvent((MouseEvent) e);
       }
-    else if (e instanceof ComponentEvent)
-      processComponentEvent((ComponentEvent) e);
     else if (e instanceof KeyEvent)
       processKeyEvent((KeyEvent) e);
     else if (e instanceof InputMethodEvent)
       processInputMethodEvent((InputMethodEvent) e);
+    else if (e instanceof ComponentEvent)
+      processComponentEvent((ComponentEvent) e);
     else if (e instanceof HierarchyEvent)
       {
         if (e.id == HierarchyEvent.HIERARCHY_CHANGED)