diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index aa504ccd7d..9a0fb2e861 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -23,6 +23,17 @@
     <key>Value</key>
     <integer>0</integer>
   </map>
+	<key>FSUseV2Friends</key>
+	<map>
+		<key>Comment</key>
+		<string>Makes Comm->Friends and Comm->Groups open the v2 based windows.</string>
+		<key>Persist</key>
+		<integer>1</integer>
+		<key>Type</key>
+		<string>Boolean</string>
+		<key>Value</key>
+		<integer>0</integer>
+	</map>
   <key>FSFolderViewItemHeight</key>
   <map>
     <key>Comment</key>
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 1bd945823b..b1b4107101 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -4029,31 +4029,44 @@ class LLTogglePanelPeopleTab : public view_listener_t
 		param["people_panel_tab_name"] = panel_name;
 
 		// <FS:Zi> Open groups and friends lists in communicate floater
-		// if (   panel_name == "friends_panel"
-		// 	|| panel_name == "groups_panel"
-		// 	|| panel_name == "nearby_panel")
-		// {
-		// 	return togglePeoplePanel(panel_name, param);
-		// }
-		if(panel_name=="nearby_panel")
+		// <FS:Lo> Adding an option to still use v2 windows
+		if(gSavedSettings.getBOOL("FSUseV2Friends"))
 		{
-			return togglePeoplePanel(panel_name,param);
+			if (   panel_name == "friends_panel"
+				|| panel_name == "groups_panel"
+				|| panel_name == "nearby_panel")
+			{
+				return togglePeoplePanel(panel_name, param);
+			}
+			else
+			{
+				return false;
+			}
 		}
-		else if(panel_name=="groups_panel")
-		{
-			FSFloaterContacts::getInstance()->openTab("groups");
-			return true;
-		}
-		else if(panel_name=="friends_panel")
-		{
-			FSFloaterContacts::getInstance()->openTab("friends");
-			return true;
-		}
-		// </FS:Zi>
 		else
 		{
-			return false;
+			if(panel_name=="nearby_panel")
+			{
+				return togglePeoplePanel(panel_name,param);
+			}
+			else if(panel_name=="groups_panel")
+			{
+				FSFloaterContacts::getInstance()->openTab("groups");
+				return true;
+			}
+			else if(panel_name=="friends_panel")
+			{
+				FSFloaterContacts::getInstance()->openTab("friends");
+				return true;
+			}
+			else
+			{
+				return false;
+			}
 		}
+		// </FS:Lo>
+		// </FS:Zi>
+		return false;
 	}
 
 	static bool togglePeoplePanel(const std::string& panel_name, const LLSD& param)