diff --git a/src/tabbed_chat_window.py b/src/tabbed_chat_window.py
index 1ac0dc420..f1e9c7cee 100644
--- a/src/tabbed_chat_window.py
+++ b/src/tabbed_chat_window.py
@@ -153,6 +153,14 @@ class Tabbed_chat_window(chat.Chat):
 		if len(self.xmls) > 0:
 			del self.users[jid]
 
+		jid = self.get_active_jid() # get the new active jid  
+		nontabbed_status_image = self.xmls[jid].get_widget(
+			'nontabbed_status_image')  
+		if len(self.xmls) > 1:  
+			nontabbed_status_image.hide()  
+		else:  
+			nontabbed_status_image.show()  
+
 	def new_user(self, user):
 		self.names[user.jid] = user.name
 		self.xmls[user.jid] = gtk.glade.XML(GTKGUI_GLADE, 'chats_vbox', APP)