diff --git a/indra/newview/llfloaterimnearbychathandler.cpp b/indra/newview/llfloaterimnearbychathandler.cpp
index f64cfd0245044bda32ee003b113aa3e5cd09abb0..8870d54cd2ba126a81585264d616a9467254d28b 100644
--- a/indra/newview/llfloaterimnearbychathandler.cpp
+++ b/indra/newview/llfloaterimnearbychathandler.cpp
@@ -604,6 +604,14 @@ void LLFloaterIMNearbyChatHandler::processChat(const LLChat& chat_msg,
 			toast_msg = chat_msg.mText;
 		}
 
+		//Don't show nearby toast, if conversation is visible but not focused
+		LLFloaterIMSessionTab* session_floater = LLFloaterIMSessionTab::getConversation(LLUUID());
+		if (session_floater
+		    && session_floater->isInVisibleChain() && !session_floater->isMinimized()
+		    && !(session_floater->getHost() && session_floater->getHost()->isMinimized()))
+		{
+			return;
+		}
 
         //Will show toast when chat preference is set        
         if(gSavedSettings.getString("NotificationNearbyChatOptions") == "toast")
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index cb03c1d2343a137a3776d44f0fad1f08c80ae64d..433ddad35d88b92888f27eeb28dce1ba0c8dd74e 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -204,19 +204,16 @@ void on_new_message(const LLSD& msg)
     bool conversation_floater_not_focused =
     		conversation_floater_is_closed || !im_box->hasFocus();
 
+    // Skip toasting and flashing if we have open window of IM with this session id
+    if (session_floater
+    && session_floater->isInVisibleChain()
+    && !session_floater->isMinimized()
+    && !(session_floater->getHost() && session_floater->getHost()->isMinimized()))
+    {
+       return;
+    }
     if ("toast" == action)
     {
-        // Skip toasting and flashing if we have open window of IM with this session id
-        if (session_floater
-            && session_floater->isInVisibleChain()
-            && session_floater->hasFocus()
-            && !session_floater->isMinimized()
-            && !(session_floater->getHost() && session_floater->getHost()->isMinimized())
-            )
-        {
-            return;
-        }
-
         //User is not focused on conversation containing the message
         if(session_floater_not_focused)
         {
diff --git a/indra/newview/skins/default/xui/en/menu_url_group.xml b/indra/newview/skins/default/xui/en/menu_url_group.xml
index 2cb125ce09465a3f074bb227cf7a7ffb5178347a..c5eaf94d2284b89960de1ebbceaf5e87d792af9c 100644
--- a/indra/newview/skins/default/xui/en/menu_url_group.xml
+++ b/indra/newview/skins/default/xui/en/menu_url_group.xml
@@ -7,7 +7,7 @@
      layout="topleft"
      name="show_group">
         <menu_item_call.on_click
-         function="Url.ShowProfile" />
+         function="Url.Execute" />
     </menu_item_call>
     <menu_item_separator
      layout="topleft" />