diff --git a/src/groupchat_control.py b/src/groupchat_control.py
index 049203ceb..fe4a430ea 100644
--- a/src/groupchat_control.py
+++ b/src/groupchat_control.py
@@ -421,6 +421,17 @@ class GroupchatControl(ChatControlBase):
 		for nick in gajim.contacts.get_nick_list(self.account, self.room_jid):
 			self.draw_contact(nick)
 
+	def _change_style(self, model, path, iter):
+		model[iter][C_NICK] = model[iter][C_NICK]
+
+	def change_roster_style(self):
+		model = self.list_treeview.get_model()
+		model.foreach(self._change_style)
+
+	def repaint_themed_widgets(self):
+		ChatControlBase.repaint_themed_widgets(self)
+		self.change_roster_style()
+
 	def _update_banner_state_image(self):
 		banner_status_img = self.xml.get_widget('gc_banner_status_image')
 		images = gajim.interface.roster.jabber_state_images
diff --git a/src/roster_window.py b/src/roster_window.py
index 96388f5d4..07fb3b9c0 100644
--- a/src/roster_window.py
+++ b/src/roster_window.py
@@ -1079,10 +1079,6 @@ class RosterWindow:
 		model.foreach(self._change_style, option)
 		for win in gajim.interface.msg_win_mgr.windows():
 			win.repaint_themed_widgets()
-		# update gc's roster
-		for ctrl in gajim.interface.msg_win_mgr.controls():
-			if ctrl.type_id == message_control.TYPE_GC:
-				ctrl.update_ui()
 
 	def draw_roster(self):
 		'''clear and draw roster'''