diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 1e32bc48b94..9c8e9abdc0c 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-12  Fernando Nasser  <fnasser@redhat.com>
+ 
+	* gnu/java/awt/peer/gtk/TestAWT.java (DialogWindow): Add WindowAdapter
+	to handle Window "Closing" events.
+ 
 2004-01-13  David Jee  <djee@redhat.com>
 
 	* gnu/java/awt/peer/gtk/GtkContainerPeer.java
diff --git a/libjava/gnu/java/awt/peer/gtk/TestAWT.java b/libjava/gnu/java/awt/peer/gtk/TestAWT.java
index 36e4416d3df..c4847bb51e6 100644
--- a/libjava/gnu/java/awt/peer/gtk/TestAWT.java
+++ b/libjava/gnu/java/awt/peer/gtk/TestAWT.java
@@ -266,6 +266,15 @@ class DialogWindow extends Dialog implements SubWindow
     super (f, true);
 
     this.parent = f;
+
+    addWindowListener (new WindowAdapter ()
+      {
+        public void windowClosing (WindowEvent e)
+        {
+          System.out.println ("Window Closing");
+          hide ();
+        }
+      });
   }
 
   public void setVisible (boolean visible)