diff --git a/src/dialogs.py b/src/dialogs.py
index 02e566b41..c11ccd7de 100644
--- a/src/dialogs.py
+++ b/src/dialogs.py
@@ -53,17 +53,20 @@ class EditGroupsDialog:
 			_("Contact's name: <i>%s</i>") % user.name)
 		self.xml.get_widget('jid_label').set_markup(
 			_('JID: <i>%s</i>') % user.jid)
+		
 		self.xml.signal_autoconnect(self)
-		self.dialog.show_all()
 		self.init_list()
 
 	def run(self):
-		self.dialog.run()
-		self.dialog.destroy()
+		self.dialog.show_all()
 		if self.changes_made:
 			gajim.connections[self.account].update_contact(self.user.jid,
 				self.user.name, self.user.groups)
 
+	def on_edit_groups_dialog_response(self, widget, response_id):
+		if response_id == gtk.RESPONSE_CLOSE:
+			self.dialog.destroy()
+
 	def update_contact(self):
 		self.plugin.roster.remove_contact(self.user, self.account)
 		self.plugin.roster.add_contact_to_roster(self.user.jid, self.account)
diff --git a/src/gtkgui.glade b/src/gtkgui.glade
index 14dd2c111..2cefa01a7 100644
--- a/src/gtkgui.glade
+++ b/src/gtkgui.glade
@@ -10611,7 +10611,7 @@ Status message</property>
   <property name="title" translatable="yes">Edit Groups</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
+  <property name="modal">True</property>
   <property name="default_height">260</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
@@ -10621,6 +10621,7 @@ Status message</property>
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="has_separator">True</property>
+  <signal name="response" handler="on_edit_groups_dialog_response" last_modification_time="Fri, 22 Jul 2005 22:28:44 GMT"/>
 
   <child internal-child="vbox">
     <widget class="GtkVBox" id="dialog-vbox6">