diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index e1ef1bbbbe..adb70296e1 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -14849,6 +14849,19 @@ Change of this parameter will affect the layout of buttons in notification toast
       <string>Boolean</string>
       <key>Value</key>
       <integer>0</integer>
+    </map>
+	<key>FSSearchGroupMaturity</key>
+    <map>
+      <key>Comment</key>
+      <string>Setting for the user's group search maturity level (consts in indra_constants.h)</string>
+      <key>Persist</key>
+      <integer>1</integer>
+	  <key>HideFromEditor</key>
+	  <integer>1</integer>
+      <key>Type</key>
+      <string>U32</string>
+      <key>Value</key>
+	  <integer>13</integer>
     </map>
     <key>ShowPGEvents</key>
     <map>
diff --git a/indra/newview/fsfloatersearch.cpp b/indra/newview/fsfloatersearch.cpp
index 6593622350..79647ba0e2 100644
--- a/indra/newview/fsfloatersearch.cpp
+++ b/indra/newview/fsfloatersearch.cpp
@@ -1169,34 +1169,32 @@ void FSPanelSearchGroups::find()
         return;
     }
 
-    static LLUICachedControl<bool> inc_pg("ShowPGSims", 1);
-    static LLUICachedControl<bool> inc_mature("ShowMatureSims", 0);
-    static LLUICachedControl<bool> inc_adult("ShowAdultSims", 0);
-    if (!(inc_pg || inc_mature || inc_adult))
+    static LLUICachedControl<U32> search_maturity("FSSearchGroupMaturity", SIM_ACCESS_PG);
+    if (!search_maturity())
     {
         LLNotificationsUtil::add("NoContentToSearch");
         return;
     }
-    U32 scope = 0;
+
+    U32 scope = DFQ_GROUPS;
     if (gAgent.wantsPGOnly())
     {
         scope |= DFQ_PG_SIMS_ONLY;
     }
     bool adult_enabled = gAgent.canAccessAdult();
     bool mature_enabled = gAgent.canAccessMature();
-    if (inc_pg)
+    if (search_maturity >= SIM_ACCESS_PG)
     {
         scope |= DFQ_INC_PG;
     }
-    if (inc_mature && mature_enabled)
+    if (mature_enabled && search_maturity >= SIM_ACCESS_MATURE)
     {
         scope |= DFQ_INC_MATURE;
     }
-    if (inc_adult && adult_enabled)
+    if (adult_enabled && search_maturity >= SIM_ACCESS_ADULT)
     {
         scope |= DFQ_INC_ADULT;
     }
-    scope |= DFQ_GROUPS;
 
     mResultsReceived = 0;
     if (mQueryID.notNull())
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index a82a9d4e80..086e3ebf20 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -2938,12 +2938,19 @@ void LLFloaterPreference::onChangeMaturity()
         gSavedSettings.setBOOL("ShowMatureSims", false);
         gSavedSettings.setBOOL("ShowMatureLand", false);
         gSavedSettings.setBOOL("ShowMatureClassifieds", false);
+        gSavedSettings.setU32("FSSearchGroupMaturity", SIM_ACCESS_PG); // <FS:TJ/> Fix legacy group search to better support maturity settings
     }
     if (!can_access_adult)
     {
         gSavedSettings.setBOOL("ShowAdultSims", false);
         gSavedSettings.setBOOL("ShowAdultLand", false);
         gSavedSettings.setBOOL("ShowAdultClassifieds", false);
+        // <FS:TJ/> Fix legacy group search to better support maturity settings
+        if (can_access_mature)
+        {
+            gSavedSettings.setU32("FSSearchGroupMaturity", SIM_ACCESS_MATURE);
+        }
+        // </FS:TJ>
     }
 }
 
diff --git a/indra/newview/llpaneldirgroups.cpp b/indra/newview/llpaneldirgroups.cpp
index 8395b7cc4a..3a856ba55e 100644
--- a/indra/newview/llpaneldirgroups.cpp
+++ b/indra/newview/llpaneldirgroups.cpp
@@ -29,6 +29,7 @@
 #include "llpaneldirgroups.h"
 
 #include "llagent.h"
+#include "llnotificationsutil.h" // <FS:TJ/>
 #include "llqueryflags.h"
 #include "llviewercontrol.h"
 #include "llsearcheditor.h"
@@ -81,11 +82,35 @@ void LLPanelDirGroups::performQuery()
     U32 scope = DFQ_GROUPS;
 
     // Check group mature filter.
-    if ( !gSavedSettings.getBOOL("ShowMatureGroups")  || gAgent.isTeen() )
+    // <FS:TJ> Fix legacy group search to better support maturity settings
+    //if ( !gSavedSettings.getBOOL("ShowMatureGroups")  || gAgent.isTeen() )
+    //{
+    //    scope |= DFQ_FILTER_MATURE;
+    //}
+    bool adult_enabled = gAgent.canAccessAdult();
+    bool mature_enabled = gAgent.canAccessMature();
+
+    static LLUICachedControl<U32> search_maturity("FSSearchGroupMaturity", SIM_ACCESS_PG);
+    if (!search_maturity())
     {
-        scope |= DFQ_FILTER_MATURE;
+        LLNotificationsUtil::add("NoContentToSearch");
+        return;
     }
 
+    if (search_maturity >= SIM_ACCESS_PG)
+    {
+        scope |= DFQ_INC_PG;
+    }
+    if (mature_enabled && search_maturity >= SIM_ACCESS_MATURE)
+    {
+        scope |= DFQ_INC_MATURE;
+    }
+    if (adult_enabled && search_maturity >= SIM_ACCESS_ADULT)
+    {
+        scope |= DFQ_INC_ADULT;
+    }
+    // </FS:TJ>
+
     mCurrentSortColumn = "score";
     mCurrentSortAscending = false;
 
diff --git a/indra/newview/skins/default/xui/en/panel_dir_groups.xml b/indra/newview/skins/default/xui/en/panel_dir_groups.xml
index 238f219f49..09a7f698e5 100644
--- a/indra/newview/skins/default/xui/en/panel_dir_groups.xml
+++ b/indra/newview/skins/default/xui/en/panel_dir_groups.xml
@@ -64,6 +64,7 @@
      width="150">
         Enter search terms:
     </text>
+    <!-- <FS:TJ> Fix legacy group search to better support maturity settings
     <check_box
      top_delta="0"
      control_name="ShowMatureGroups"
@@ -76,7 +77,32 @@
      left="510"
      mouse_opaque="true"
      name="incmature"
-     width="100" />
+     width="100" /> -->
+    <combo_box
+     control_name="FSSearchGroupMaturity"
+     follows="right|top"
+     layout="topleft"
+     height="18"
+     allow_text_entry="false"
+     left="609"
+     top_delta="-2"
+     left_pad="2"
+     name="groups_maturity"
+     width="167">
+       <combo_box.item
+        label="General"
+        name="Desired_PG"
+        value="13" />
+       <combo_box.item
+        label="General and Moderate"
+        name="Desired_Mature"
+        value="21" />
+       <combo_box.item
+        label="General, Moderate, Adult"
+        name="Desired_Adult"
+        value="42" />
+		</combo_box>
+    <!-- </FS:TJ> -->
     <search_combo_box
      layout="topleft"
      follows="left|top|right"
diff --git a/indra/newview/skins/default/xui/en/panel_fs_search_legacy_groups.xml b/indra/newview/skins/default/xui/en/panel_fs_search_legacy_groups.xml
index 90001952f7..9171294700 100644
--- a/indra/newview/skins/default/xui/en/panel_fs_search_legacy_groups.xml
+++ b/indra/newview/skins/default/xui/en/panel_fs_search_legacy_groups.xml
@@ -38,69 +38,29 @@
 		top="29"
 		width="770">
 		</search_combo_box>
-		<check_box
-		control_name="ShowPGGroups"
-		follows="right|top"
-		height="16"
-		label=""
-		layout="topleft"
-		left="660"
-		name="pg_all"
-		top="12"
-		width="15"
-		visible="false"/>
-		<icon
-		follows="right|top"
-		height="16"
-		image_name="Parcel_PG_Dark"
-		layout="topleft"
-		left_pad="2"
-		name="rating_icon_general"
-		top_delta="-1"
-		width="18"
-		visible="false"/>
-		<check_box
-		control_name="ShowMatureGroups"
-		follows="right|top"
-		height="16"
-		label=""
-		layout="topleft"
-		left_pad="2"
-		name="mature_all"
-		top_delta="1"
-		width="15"
-		visible="false"/>
-		<icon
-		follows="right|top"
-		height="16"
-		image_name="Parcel_M_Dark"
-		layout="topleft"
-		left_pad="2"
-		name="rating_icon_moderate"
-		top_delta="-1"
-		width="18"
-		visible="false"/>
-		<check_box
-		control_name="ShowAdultGroups"
-		follows="right|top"
-		height="16"
-		label=""
-		layout="topleft"
-		left_pad="2"
-		name="adult_all"
-		top_delta="1"
-		width="15"
-		visible="false"/>
-		<icon
-		follows="right|top"
-		height="16"
-		image_name="Parcel_R_Dark"
-		layout="topleft"
-		left_pad="2"
-		name="rating_icon_adult"
-		top_delta="-1"
-		width="18"
-		visible="false"/>
+		<combo_box
+		 control_name="FSSearchGroupMaturity"
+		 follows="right|top"
+		 layout="topleft"
+		 height="23"
+		 allow_text_entry="false"
+		 top="4"
+		 left="609"
+		 name="groups_maturity"
+		 width="167">
+			<combo_box.item
+			 label="General"
+			 name="Desired_PG"
+			 value="13" />
+			<combo_box.item
+			 label="General and Moderate"
+			 name="Desired_Mature"
+			 value="21" />
+			<combo_box.item
+			 label="General, Moderate, Adult"
+			 name="Desired_Adult"
+			 value="42" />
+		</combo_box>
 	</panel>
 	<!-- Search Pane -->
 	<panel