diff --git a/plugins/gtkgui/groupchat_window.py b/plugins/gtkgui/groupchat_window.py
index 337646937..fa73faf9e 100644
--- a/plugins/gtkgui/groupchat_window.py
+++ b/plugins/gtkgui/groupchat_window.py
@@ -88,8 +88,9 @@ class Groupchat_window(Chat):
 			if self.childs[jid] == new_child: 
 				new_jid = jid
 				break
-		self.set_subject(self, new_jid, subject)
-		Chat.on_chat_notebook_switch_page(notebook, page, page_num)
+		self.xml.get_widget('subject_entry').set_text(\
+			self.subjects[new_jid])
+		Chat.on_chat_notebook_switch_page(self, notebook, page, page_num)
 
 	def get_role_iter(self, room_jid, role):
 		model = self.list_treeview[room_jid].get_model()
diff --git a/plugins/gtkgui/gtkgui.glade b/plugins/gtkgui/gtkgui.glade
index ea7fae9a5..f18973db7 100644
--- a/plugins/gtkgui/gtkgui.glade
+++ b/plugins/gtkgui/gtkgui.glade
@@ -7053,6 +7053,8 @@ Custom</property>
 	  <property name="tab_pos">GTK_POS_TOP</property>
 	  <property name="scrollable">True</property>
 	  <property name="enable_popup">False</property>
+	  <signal name="switch_page" handler="on_chat_notebook_switch_page" last_modification_time="Wed, 16 Mar 2005 20:58:25 GMT"/>
+	  <signal name="key_press_event" handler="on_chat_notebook_key_press_event" last_modification_time="Wed, 16 Mar 2005 20:58:38 GMT"/>
 
 	  <child>
 	    <widget class="GtkVBox" id="gc_vbox">