diff --git a/plugins/gtkgui/gtkgui.glade b/plugins/gtkgui/gtkgui.glade
index a8e2c967b..6674c8855 100644
--- a/plugins/gtkgui/gtkgui.glade
+++ b/plugins/gtkgui/gtkgui.glade
@@ -8143,8 +8143,7 @@ Custom</property>
   <child>
     <widget class="GtkNotebook" id="notebook">
       <property name="visible">True</property>
-      <property name="can_focus">True</property>
-      <property name="show_tabs">True</property>
+      <property name="show_tabs">False</property>
       <property name="show_border">True</property>
       <property name="tab_pos">GTK_POS_TOP</property>
       <property name="scrollable">False</property>
diff --git a/plugins/gtkgui/gtkgui.py b/plugins/gtkgui/gtkgui.py
index a1696c695..7e6be0d45 100644
--- a/plugins/gtkgui/gtkgui.py
+++ b/plugins/gtkgui/gtkgui.py
@@ -292,18 +292,7 @@ class tabbed_chat_Window:
 		"""When close button is pressed :
 		close a tab"""
 		jid = self.get_active_jid()
-		if len(self.widgets) == 1:
-			button.get_toplevel().destroy()
-		else:
-			nb = self.xml.get_widget('notebook')
-			nb.remove_page(nb.get_current_page())
-			del self.plugin.windows[self.account]['chats'][jid]
-			del self.users[jid]
-			del self.nb_unread[jid]
-			del self.widgets[jid]
-			del self.tagIn[jid]
-			del self.tagOut[jid]
-			del self.tagStatus[jid]
+		self.remove_tab(jid)
 
 	def on_focus(self, widget, event):
 		"""When window get focus"""
@@ -340,6 +329,22 @@ class tabbed_chat_Window:
 		nb.set_current_page(nb.page_num(child))
 		self.widgets[jid]['message'].grab_focus()
 
+	def remove_tab(self, jid):
+		if len(self.widgets) == 1:
+			self.window.destroy()
+		else:
+			nb = self.xml.get_widget('notebook')
+			nb.remove_page(nb.get_current_page())
+			del self.plugin.windows[self.account]['chats'][jid]
+			del self.users[jid]
+			del self.nb_unread[jid]
+			del self.widgets[jid]
+			del self.tagIn[jid]
+			del self.tagOut[jid]
+			del self.tagStatus[jid]
+			if len(self.widgets) == 1:
+				nb.set_show_tabs(False)
+
 	def new_user(self, user):
 		self.nb_unread[user.jid] = 0
 		self.users[user.jid] = user
@@ -430,6 +435,8 @@ class tabbed_chat_Window:
 		vb.show_all()
 		nb = self.xml.get_widget("notebook")
 		nb.append_page(vb)
+		if len(self.widgets) > 1:
+			nb.set_show_tabs(True)
 
 		self.redraw_tab(user.jid)
 		self.draw_widgets(user)
@@ -468,17 +475,7 @@ class tabbed_chat_Window:
 		st = "1234567890"
 		if event.keyval == gtk.keysyms.Escape:
 			jid = self.get_active_jid()
-			if len(self.widgets) == 1:
-				widget.get_toplevel().destroy()
-			else:
-				nb.remove_page(nb.get_current_page())
-				del self.plugin.windows[self.account]['chats'][jid]
-				del self.users[jid]
-				del self.nb_unread[jid]
-				del self.widgets[jid]
-				del self.tagIn[jid]
-				del self.tagOut[jid]
-				del self.tagStatus[jid]
+			self.remove_tab(jid)
 		elif event.string and event.string in st \
 			and (event.state & gtk.gdk.MOD1_MASK):
 			nb.set_current_page(st.index(event.string))