Index: src/gossip-chat-window.c
===================================================================
RCS file: /cvs/gnome/gossip/src/gossip-chat-window.c,v
retrieving revision 1.98
diff -u -r1.98 gossip-chat-window.c
--- src/gossip-chat-window.c	10 Jun 2006 11:07:01 -0000	1.98
+++ src/gossip-chat-window.c	15 Jun 2006 13:33:14 -0000
@@ -323,6 +323,10 @@
 					 0,
 					 closure);
 	}
+	closure = g_cclosure_new (G_CALLBACK (chat_window_accel_cb),
+				  window,
+				  NULL);
+	gtk_accel_group_connect (accel_group, GDK_Escape, 0, 0, closure);
 
 	/* Set the contact information menu item image to the Gossip
 	 * stock image 
@@ -523,6 +527,11 @@
 	gint                  i;
 
 	priv = GET_PRIV (window);
+
+	if (key == GDK_Escape && mod == 0) {
+		chat_window_close_activate_cb (NULL, window);
+		return;
+	}
 
 	for (i = 0; i < G_N_ELEMENTS (tab_accel_keys); i++) {
 		if (tab_accel_keys[i] == key) {
