diff --git a/src/groupchat_window.py b/src/groupchat_window.py
index 5e68590fd..a6e921318 100644
--- a/src/groupchat_window.py
+++ b/src/groupchat_window.py
@@ -62,8 +62,8 @@ class GroupchatWindow(chat.Chat):
 			self.on_groupchat_window_delete_event)
 		self.xml.signal_connect('on_groupchat_window_focus_in_event', 
 			self.on_groupchat_window_focus_in_event)
-		self.xml.signal_connect('on_groupchat_window_event',
-			self.on_groupchat_window_event)
+		self.xml.signal_connect('on_groupchat_window_button_press_event',
+			self.on_chat_window_button_press_event)
 		self.xml.signal_connect('on_chat_notebook_key_press_event', 
 			self.on_chat_notebook_key_press_event)
 		self.xml.signal_connect('on_chat_notebook_switch_page', 
@@ -131,12 +131,6 @@ class GroupchatWindow(chat.Chat):
 		"""When window get focus"""
 		chat.Chat.on_chat_window_focus_in_event(self, widget, event)
 
-	def on_groupchat_window_event(self, widget, event):
-		if event.type != gtk.gdk.BUTTON_PRESS:
-			return False
-		self.on_chat_window_button_press_event(widget, event)
-		return True
-
 	def on_groupchat_window_key_press_event(self, widget, event):
 		self.on_chat_window_button_press_event(widget, event)
 		return True
diff --git a/src/gtkgui.glade b/src/gtkgui.glade
index a9587d25d..5bb7e4a74 100644
--- a/src/gtkgui.glade
+++ b/src/gtkgui.glade
@@ -8274,7 +8274,7 @@ Custom</property>
   <signal name="focus_in_event" handler="on_groupchat_window_focus_in_event" last_modification_time="Sat, 05 Mar 2005 00:34:51 GMT"/>
   <signal name="delete_event" handler="on_groupchat_window_delete_event" last_modification_time="Mon, 07 Mar 2005 11:19:05 GMT"/>
   <signal name="destroy" handler="on_groupchat_window_destroy" last_modification_time="Mon, 07 Mar 2005 16:46:37 GMT"/>
-  <signal name="event" handler="on_groupchat_window_event"/>
+  <signal name="button_press_event" handler="on_groupchat_window_button_press_event" last_modification_time="Fri, 24 Jun 2005 23:52:31 GMT"/>
 
   <child>
     <widget class="GtkVBox" id="vbox73">
@@ -9738,6 +9738,7 @@ Custom</property>
   <signal name="delete_event" handler="on_tabbed_chat_window_delete_event" last_modification_time="Mon, 07 Mar 2005 11:06:00 GMT"/>
   <signal name="destroy" handler="on_tabbed_chat_window_destroy" last_modification_time="Mon, 07 Mar 2005 16:35:25 GMT"/>
   <signal name="event" handler="on_tabbed_chat_window_event"/>
+  <signal name="button_press_event" handler="on_tabbed_chat_window_button_press_event" last_modification_time="Fri, 24 Jun 2005 23:54:20 GMT"/>
 
   <child>
     <widget class="GtkNotebook" id="chat_notebook">
diff --git a/src/tabbed_chat_window.py b/src/tabbed_chat_window.py
index ef1ed1b38..9e58bcbb7 100644
--- a/src/tabbed_chat_window.py
+++ b/src/tabbed_chat_window.py
@@ -47,17 +47,17 @@ class TabbedChatWindow(chat.Chat):
 		self.encrypted = {}
 		self.new_user(user)
 		self.show_title()
-		self.xml.signal_connect('on_tabbed_chat_window_destroy', 
+		self.xml.signal_connect('on_tabbed_chat_window_destroy',
 			self.on_tabbed_chat_window_destroy)
-		self.xml.signal_connect('on_tabbed_chat_window_delete_event', 
+		self.xml.signal_connect('on_tabbed_chat_window_delete_event',
 			self.on_tabbed_chat_window_delete_event)
-		self.xml.signal_connect('on_tabbed_chat_window_focus_in_event', 
+		self.xml.signal_connect('on_tabbed_chat_window_focus_in_event',
 			self.on_tabbed_chat_window_focus_in_event)
-		self.xml.signal_connect('on_tabbed_chat_window_event',
-			self.on_tabbed_chat_window_event)
-		self.xml.signal_connect('on_chat_notebook_key_press_event', 
+		self.xml.signal_connect('on_tabbed_chat_window_button_press_event',
+			self.on_chat_window_button_press_event)
+		self.xml.signal_connect('on_chat_notebook_key_press_event',
 			self.on_chat_notebook_key_press_event)
-		self.xml.signal_connect('on_chat_notebook_switch_page', 
+		self.xml.signal_connect('on_chat_notebook_switch_page',
 			self.on_chat_notebook_switch_page)
 
 		if gajim.config.get('saveposition'):