diff --git a/indra/newview/llgrouplist.cpp b/indra/newview/llgrouplist.cpp
index d13744054739324311761dc74797d097a0788bba..14310536b2a79af3dc84c1c1c8bd09f1f8ce7aae 100644
--- a/indra/newview/llgrouplist.cpp
+++ b/indra/newview/llgrouplist.cpp
@@ -475,14 +475,17 @@ void LLGroupListItem::onMouseEnter(S32 x, S32 y, MASK mask)
 	{
 		mInfoBtn->setVisible(true);
         mProfileBtn->setVisible(true);
-        mNoticesBtn->setVisible(true);
-        if (mForAgent && mVisibilityHideBtn)
+        if (mForAgent)
         {
             LLGroupData agent_gdatap;
             if (gAgent.getGroupData(mGroupID, agent_gdatap))
             {
-                mVisibilityHideBtn->setVisible(agent_gdatap.mListInProfile);
-                mVisibilityShowBtn->setVisible(!agent_gdatap.mListInProfile);
+                if (mVisibilityHideBtn)
+                {
+                    mVisibilityHideBtn->setVisible(agent_gdatap.mListInProfile);
+                    mVisibilityShowBtn->setVisible(!agent_gdatap.mListInProfile);
+                }
+                mNoticesBtn->setVisible(true);
             }
         }
 	}
diff --git a/indra/newview/skins/default/xui/en/panel_group_list_item_short.xml b/indra/newview/skins/default/xui/en/panel_group_list_item_short.xml
index 042a5f388bed804f141930849222f7695a664481..9e19588033e991df3c584670fc77cc2288ef5f56 100644
--- a/indra/newview/skins/default/xui/en/panel_group_list_item_short.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_list_item_short.xml
@@ -64,7 +64,8 @@
      follows="right"
      image_pressed="Group_Notices"
      image_unselected="Group_Notices"
-     tab_stop="false"/>
+     tab_stop="false"
+     visible="false"/>
     <button
      name="visibility_hide_btn"
      tool_tip="Hide group on my profile"