diff --git a/plugins/gtkgui/dialogs.py b/plugins/gtkgui/dialogs.py
index 89d6fa074..c117ea583 100644
--- a/plugins/gtkgui/dialogs.py
+++ b/plugins/gtkgui/dialogs.py
@@ -653,7 +653,7 @@ class subscription_request_window:
 class Join_groupchat_window:
 	def __init__(self, plugin, account, server='', room = ''):
 		if plugin.connected[account] < 2:
-			Error_dialog(_('You must be connected to join a group chat'))
+			Error_dialog(_('You must be connected to join a groupchat'))
 			return
 		self.plugin = plugin
 		self.account = account
diff --git a/plugins/gtkgui/groupchat_window.py b/plugins/gtkgui/groupchat_window.py
index 91f5e7530..3888991c1 100644
--- a/plugins/gtkgui/groupchat_window.py
+++ b/plugins/gtkgui/groupchat_window.py
@@ -487,6 +487,7 @@ class Groupchat_window(Chat):
 		self.show_title()
 	
 	def on_join_groupchat_window_key_press_event(self, widget, event):
+		print 'called'
 		if event.keyval == gtk.keysyms.Escape:
 			widget.get_toplevel().destroy()
 
@@ -514,7 +515,7 @@ class Groupchat_window(Chat):
 					widget.get_selection().unselect_all()
 					return False
 
-				model = self.tree.get_model()
+				model = widget.get_model()
 				iter = model.get_iter(path)
 				type = model.get_value(iter, 2)
 				if (type == 'group' or type == 'account'):
diff --git a/plugins/gtkgui/gtkgui.glade b/plugins/gtkgui/gtkgui.glade
index d07b80fed..313557dba 100644
--- a/plugins/gtkgui/gtkgui.glade
+++ b/plugins/gtkgui/gtkgui.glade
@@ -7759,6 +7759,7 @@ Custom</property>
 
 		      <child>
 			<widget class="GtkScrolledWindow" id="scrolledwindow17">
+			  <property name="width_request">100</property>
 			  <property name="visible">True</property>
 			  <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
 			  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>