diff --git a/src/fe-gtk/maingui.c b/src/fe-gtk/maingui.c
index edc47fce..0009198e 100644
--- a/src/fe-gtk/maingui.c
+++ b/src/fe-gtk/maingui.c
@@ -243,7 +243,8 @@ fe_set_tab_color (struct session *sess, int col)
 			chan_set_color (sess->res->tab, newdata_list);
 
 			if (chan_is_collapsed (sess->res->tab)
-				&& !(server_sess->msg_said || server_sess->nick_said))
+				&& !(server_sess->msg_said || server_sess->nick_said)
+				&& !(server_sess == current_tab))
 			{
 				server_sess->new_data = TRUE;
 				server_sess->msg_said = FALSE;
@@ -258,7 +259,9 @@ fe_set_tab_color (struct session *sess, int col)
 			sess->nick_said = FALSE;
 			chan_set_color (sess->res->tab, newmsg_list);
 			
-			if (chan_is_collapsed (sess->res->tab) && !server_sess->nick_said)
+			if (chan_is_collapsed (sess->res->tab) 
+				&& !server_sess->nick_said
+				&& !(server_sess == current_tab))
 			{
 				server_sess->new_data = FALSE;
 				server_sess->msg_said = TRUE;
@@ -273,7 +276,7 @@ fe_set_tab_color (struct session *sess, int col)
 			sess->nick_said = TRUE;
 			chan_set_color (sess->res->tab, nickseen_list);
 
-			if (chan_is_collapsed (sess->res->tab))
+			if (chan_is_collapsed (sess->res->tab) && !(server_sess == current_tab))
 			{
 				server_sess->new_data = FALSE;
 				server_sess->msg_said = FALSE;