diff --git a/src/groupchat_control.py b/src/groupchat_control.py
index ae0deb5e9af2523440f83f80f185e24ceacc73d4..e8fe4d42d1c44e943c1feb8087b992d5e091b120 100644
--- a/src/groupchat_control.py
+++ b/src/groupchat_control.py
@@ -21,7 +21,6 @@
 ##
 
 import os
-import re
 import time
 import gtk
 import gtk.glade
@@ -1037,7 +1036,7 @@ class GroupchatControl(ChatControlBase):
 				sectext = _('If you close this window, you will be disconnected '
 						'from this room.')
 
-				escaped_name = re.subn("_", "__", self.name)[0]
+				escaped_name = gtkgui_helpers.escape_underscore(self.name)
 				dialog = dialogs.ConfirmationDialogCheck(pritext, sectext,
 							_('Do _not ask me about closing "%s" again' %\
 							escaped_name))
diff --git a/src/gtkgui_helpers.py b/src/gtkgui_helpers.py
index 1c8b1f5cb1980893d66b68b10b32d2585d987d5a..927e7bb944a30fcdee0e226915164d990cd29e8f 100644
--- a/src/gtkgui_helpers.py
+++ b/src/gtkgui_helpers.py
@@ -572,3 +572,8 @@ icon=gajim
 Description=xmpp
 ''' % command)
 			f.close()
+
+def escape_underscore(s):
+	'''Escape underlines to prevent them from being interpreted
+	as keyboard accelerators'''
+	return s.replace('_', '__')