diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c
index 77fa538..4ef00b0 100644
--- a/src/empathy-main-window.c
+++ b/src/empathy-main-window.c
@@ -125,6 +125,8 @@ static void     main_window_favorite_chatroom_menu_update      (EmpathyMainWindo
 static void     main_window_favorite_chatroom_menu_add         (EmpathyMainWindow        *window,
 								EmpathyChatroom          *chatroom);
 static void     main_window_favorite_chatroom_join             (EmpathyChatroom          *chatroom);
+static void     main_window_chat_close_cb                      (GtkWidget                *widget,
+								EmpathyMainWindow        *window);
 static void     main_window_chat_quit_cb                       (GtkWidget                *widget,
 								EmpathyMainWindow        *window);
 static void     main_window_chat_new_message_cb                (GtkWidget                *widget,
@@ -540,6 +542,7 @@ empathy_main_window_show (void)
 			      window,
 			      "main_window", "destroy", main_window_destroy_cb,
 			      "main_window", "configure_event", main_window_configure_event_cb,
+			      "chat_close", "activate", main_window_chat_close_cb,
 			      "chat_quit", "activate", main_window_chat_quit_cb,
 			      "chat_new_message", "activate", main_window_chat_new_message_cb,
 			      "chat_history", "activate", main_window_chat_history_cb,
@@ -881,6 +884,13 @@ main_window_favorite_chatroom_join (EmpathyChatroom *chatroom)
 }
 
 static void
+main_window_chat_close_cb (GtkWidget         *widget,
+			   EmpathyMainWindow *window)
+{
+	g_signal_emit_by_name (window->window, "delete-event");
+}
+
+static void
 main_window_chat_quit_cb (GtkWidget         *widget,
 			  EmpathyMainWindow *window)
 {
diff --git a/src/empathy-main-window.glade b/src/empathy-main-window.glade
index 737105d..2c91913 100644
--- a/src/empathy-main-window.glade
+++ b/src/empathy-main-window.glade
@@ -88,6 +88,15 @@
                       </widget>
                     </child>
                     <child>
+                      <widget class="GtkImageMenuItem" id="chat_close">
+                        <property name="visible">True</property>
+                        <property name="label">gtk-close</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                        <accelerator key="W" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+                      </widget>
+                    </child>
+                    <child>
                       <widget class="GtkImageMenuItem" id="chat_quit">
                         <property name="visible">True</property>
                         <property name="label">gtk-quit</property>
