diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp
index 6311998fe..7e74326e0 100644
--- a/indra/newview/llimpanel.cpp
+++ b/indra/newview/llimpanel.cpp
@@ -876,7 +876,7 @@ void LLFloaterIMPanel::addHistoryLine(const std::string &utf8msg, LLColor4 incol
 		// [/Ansariel: Display name support]
 	}
 
-	if (!isInVisibleChain())
+	if (!isInVisibleChain() || (!hasFocus() && getParent() == gFloaterView))
 	{
 		mNumUnreadMessages++;
 	}
@@ -1725,6 +1725,7 @@ BOOL LLFloaterIMPanel::focusFirstItem(BOOL prefer_text_fields, BOOL focus_flash
 
 void LLFloaterIMPanel::onFocusReceived()
 {
+	mNumUnreadMessages = 0;
 	if (getVisible() && mInputEditor->getVisible())
 	{
 		setInputFocus(true);