diff --git a/src/chat.py b/src/chat.py
index b9c715876..5bfd78444 100644
--- a/src/chat.py
+++ b/src/chat.py
@@ -88,7 +88,7 @@ class Chat:
 		else:
 			nb_pos = gtk.POS_TOP
 		self.notebook.set_tab_pos(nb_pos)
-		self.notebook.set_show_tabs(gajim.config.get('tabs_always_show'))
+		self.notebook.set_show_tabs(gajim.config.get('tabs_always_visible'))
 		self.notebook.set_show_border(gajim.config.get('tabs_border'))
 
 	def update_font(self):
@@ -175,7 +175,9 @@ class Chat:
 			nickname = hb.get_children()[0]
 			close_button = hb.get_children()[1]
 
-		if not gajim.config.get('tab_close_button'):
+		if gajim.config.get('tabs_close_button'):
+			close_button.show()
+		else:
 			close_button.hide()
 
 		#FIXME: when gtk2.4 is OOOOLD do it via glade2.10+
diff --git a/src/common/config.py b/src/common/config.py
index fb9cbfb7d..6cb7860bd 100644
--- a/src/common/config.py
+++ b/src/common/config.py
@@ -142,7 +142,7 @@ class Config:
 		'last_sounds_dir': [opt_str, ''],
 		#FIXME: add combobox in prefs for this in .9
 		'tabs_position': [opt_str, 'top'], # top, bottom, left, right
-		'tabs_always_show': [opt_bool, False], # show tab if one tab?
+		'tabs_always_visible': [opt_bool, False], # show tab if one tab?
 		'tabs_border': [opt_bool, False], # border if one tab?
 		'tabs_close_button': [opt_bool, True], # close button in tab?
 	}