diff --git a/src/chat.py b/src/chat.py
index 5bfd78444e40b667e3d6ebd220d1b3fbc7e331fc..58f241b616c84f42c6e6bb3ae0a685a2816df95c 100644
--- a/src/chat.py
+++ b/src/chat.py
@@ -430,7 +430,8 @@ class Chat:
 		del self.tagStatus[jid]
 		
 		if len(self.xmls) == 1: # we now have only one tab
-			self.notebook.set_show_tabs(self.notebook.get_show_tabs())
+			show_tabs_if_one_tab = gajim.config.get('tabs_always_visible')
+			self.notebook.set_show_tabs(show_tabs_if_one_tab)
 			self.show_title()
 	
 	def bring_scroll_to_end(self, textview, diff_y = 0):