diff --git a/indra/newview/llnamelistctrl.cpp b/indra/newview/llnamelistctrl.cpp
index df3c50b2ba..bc24c25bd7 100644
--- a/indra/newview/llnamelistctrl.cpp
+++ b/indra/newview/llnamelistctrl.cpp
@@ -300,9 +300,9 @@ BOOL LLNameListCtrl::handleRightMouseDown(S32 x, S32 y, MASK mask)
 {
     LLNameListItem* hit_item = dynamic_cast<LLNameListItem*>(hitItem(x, y));
     LLFloater* floater = gFloaterView->getParentFloater(this);
-    if (floater && floater->isFrontmost() && hit_item)
+    if (floater && floater->isFrontmost() && hit_item && hit_item->isGroup()) // <FS:Ansariel> Fix wrong check
     {
-        if(hit_item->isGroup())
+        //if(hit_item->isGroup()) // <FS:Ansariel> Fix wrong check
         {
             ContextMenuType prev_menu = getContextMenuType();
             setContextMenu(MENU_GROUP);
@@ -311,7 +311,9 @@ BOOL LLNameListCtrl::handleRightMouseDown(S32 x, S32 y, MASK mask)
             return handled;
         }
     }
-    return LLScrollListCtrl::handleRightMouseDown(x, y, mask);    
+    // <FS:Ansariel> Inherit from FSScrollListCtrl for additional features
+    //return LLScrollListCtrl::handleRightMouseDown(x, y, mask);    
+    return FSScrollListCtrl::handleRightMouseDown(x, y, mask);
 }
 
 // public
diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp
index c64fdb05bf..9d2ca64635 100644
--- a/indra/newview/llviewercontrol.cpp
+++ b/indra/newview/llviewercontrol.cpp
@@ -1239,7 +1239,7 @@ void settings_setup_listeners()
 	setting_setup_signal_listener(gSavedSettings, "RenderDeferredSSAO", handleSetShaderChanged);
 	setting_setup_signal_listener(gSavedSettings, "RenderPerformanceTest", handleRenderPerfTestChanged);
 	setting_setup_signal_listener(gSavedSettings, "TextureMemory", handleVideoMemoryChanged);
-	setting_setup_signal_listener(gSavedSettings, "ChatFontSize", handleChatFontSizeChanged);
+	setting_setup_signal_listener(gSavedSettings, "ChatConsoleFontSize", handleChatFontSizeChanged);
 	setting_setup_signal_listener(gSavedSettings, "ChatPersistTime", handleChatPersistTimeChanged);
 	setting_setup_signal_listener(gSavedSettings, "ConsoleMaxLines", handleConsoleMaxLinesChanged);
 	setting_setup_signal_listener(gSavedSettings, "UploadBakedTexOld", handleUploadBakedTexOldChanged);
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 94b07bda62..6e3b8b034d 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -5194,7 +5194,8 @@ void process_avatar_animation(LLMessageSystem *mesgsys, void **user_data)
 	if (!avatarp)
 	{
 		// no agent by this ID...error?
-		LL_WARNS("Messaging") << "Received animation state for unknown avatar " << uuid << LL_ENDL;
+		if (!gSavedSettings.getBOOL("FSRenderFriendsOnly")) // <FS:Ansariel> FIRE-32520: Prevent log spam when show friends only is enabled
+			LL_WARNS("Messaging") << "Received animation state for unknown avatar " << uuid << LL_ENDL;
 		return;
 	}