diff --git a/indra/newview/fsfloateraddtocontactset.cpp b/indra/newview/fsfloateraddtocontactset.cpp
index fe4c20997c..1b5e03f6f5 100644
--- a/indra/newview/fsfloateraddtocontactset.cpp
+++ b/indra/newview/fsfloateraddtocontactset.cpp
@@ -53,6 +53,7 @@ BOOL FSFloaterAddToContactSet::postBuild()
 	
 	childSetAction("add_btn",	boost::bind(&FSFloaterAddToContactSet::onClickAdd, this));
 	childSetAction("cancel_btn", boost::bind(&FSFloaterAddToContactSet::onClickCancel, this));
+	childSetAction("add_set_btn", boost::bind(&FSFloaterAddToContactSet::onClickAddSet, this));
 	
 	return TRUE;
 }
@@ -75,6 +76,11 @@ void FSFloaterAddToContactSet::onClickCancel()
 	closeFloater();
 }
 
+void FSFloaterAddToContactSet::onClickAddSet()
+{
+	LLNotificationsUtil::add("AddNewContactSet", LLSD(), LLSD(), &LGGContactSets::handleAddContactSetCallback);
+}
+
 void FSFloaterAddToContactSet::updateSets(LGGContactSets::EContactSetUpdate type)
 {
 	if (type)
@@ -85,12 +91,11 @@ void FSFloaterAddToContactSet::populateContactSets()
 {
 	if (!mContactSetsCombo) return;
 	
-	mContactSetsCombo->clear();
+	mContactSetsCombo->clearRows();
 	std::vector<std::string> contact_sets = LGGContactSets::getInstance()->getAllGroups();
 	if (contact_sets.empty())
 	{
 		mContactSetsCombo->add(getString("no_sets"), LLSD("No Set"));
-		getChild<LLButton>("add_btn")->setEnabled(FALSE);
 	}
 	else
 	{
@@ -99,4 +104,5 @@ void FSFloaterAddToContactSet::populateContactSets()
 			mContactSetsCombo->add(set_name);
 		}
 	}
+	getChild<LLButton>("add_btn")->setEnabled(!contact_sets.empty());
 }
diff --git a/indra/newview/fsfloateraddtocontactset.h b/indra/newview/fsfloateraddtocontactset.h
index b89fd2e064..54e0d92724 100644
--- a/indra/newview/fsfloateraddtocontactset.h
+++ b/indra/newview/fsfloateraddtocontactset.h
@@ -46,6 +46,7 @@ private:
 	~FSFloaterAddToContactSet(){};
 	void onClickAdd();
 	void onClickCancel();
+	void onClickAddSet();
 	void populateContactSets();
 	
 	void updateSets(LGGContactSets::EContactSetUpdate type);
diff --git a/indra/newview/skins/default/xui/en/floater_fs_contact_add.xml b/indra/newview/skins/default/xui/en/floater_fs_contact_add.xml
index 8c6e7cc14c..48d5185818 100644
--- a/indra/newview/skins/default/xui/en/floater_fs_contact_add.xml
+++ b/indra/newview/skins/default/xui/en/floater_fs_contact_add.xml
@@ -32,7 +32,16 @@ No contact sets available.
 	 top_pad="4"
 	 left="8"
 	 name="contact_sets"
-	 width="265"/>
+	 width="239"/>
+    <button
+     left_pad="2"
+     top_delta="0"
+     follows="top|right"
+     layout="topleft"
+     height="24"
+	 image_overlay="AddItem_Off"
+     name="add_set_btn"
+     width="24" />
 	<button
 	 left="8"
 	 top_pad="3"