diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp
index 9eed719b5..4ed076b6d 100644
--- a/indra/newview/llimpanel.cpp
+++ b/indra/newview/llimpanel.cpp
@@ -524,11 +524,14 @@ BOOL LLFloaterIMPanel::postBuild()
 		if (LLComboBox* flyout = findChild<LLComboBox>("instant_message_flyout"))
 		{
 			flyout->setCommitCallback(boost::bind(&LLFloaterIMPanel::onFlyoutCommit, this, flyout, _2));
-			if (is_agent_mappable(mOtherParticipantUUID))
-				flyout->add(getString("find on map"), -2);
-			addDynamics(flyout);
-			if (gObjectList.findAvatar(mOtherParticipantUUID))
-				flyout->add(getString("focus"), -3);
+			if (mSessionType == P2P_SESSION)
+			{
+				if (is_agent_mappable(mOtherParticipantUUID))
+					flyout->add(getString("find on map"), -2);
+				addDynamics(flyout);
+				if (gObjectList.findAvatar(mOtherParticipantUUID))
+					flyout->add(getString("focus"), -3);
+			}
 		}
 		if (LLUICtrl* ctrl = findChild<LLUICtrl>("tp_btn"))
 			ctrl->setCommitCallback(boost::bind(static_cast<void(*)(const LLUUID&)>(LLAvatarActions::offerTeleport), mOtherParticipantUUID));