diff --git a/doc/contributions.txt b/doc/contributions.txt
index bf33b7b5f2..076943d1fe 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -239,6 +239,7 @@ Ansariel Hiller
 	SL-15227
 	SL-15398
 	SL-18432
+	SL-19140
 Aralara Rajal
 Arare Chantilly
 	CHUIBUG-191
diff --git a/indra/newview/llfloatermarketplacelistings.cpp b/indra/newview/llfloatermarketplacelistings.cpp
index fd56aa1976..6002112257 100644
--- a/indra/newview/llfloatermarketplacelistings.cpp
+++ b/indra/newview/llfloatermarketplacelistings.cpp
@@ -45,8 +45,8 @@
 #include "lltabcontainer.h"
 #include "lltextbox.h"
 #include "lltrans.h"
+#include "llviewerwindow.h"
 #include "fscommon.h"
-#include "llviewerwindow.h" // <FS:Ansariel> Multi item properties floater
 
 ///----------------------------------------------------------------------------
 /// LLPanelMarketplaceListings
@@ -997,7 +997,6 @@ void LLFloaterItemProperties::onOpen(const LLSD& key)
     }
 }
 
-// <FS:Ansariel> Multi item properties floater
 LLMultiItemProperties::LLMultiItemProperties(const LLSD& key)
 	: LLMultiFloater(LLSD())
 {
@@ -1015,4 +1014,3 @@ LLMultiItemProperties::LLMultiItemProperties(const LLSD& key)
 	// <FS:Ansariel> Center multifloater on screen
 	center();
 }
-// </FS:Ansariel>
diff --git a/indra/newview/llfloatermarketplacelistings.h b/indra/newview/llfloatermarketplacelistings.h
index 0829c26291..33be7cf06b 100644
--- a/indra/newview/llfloatermarketplacelistings.h
+++ b/indra/newview/llfloatermarketplacelistings.h
@@ -33,8 +33,8 @@
 #include "llinventorypanel.h"
 #include "llnotificationptr.h"
 #include "llmodaldialog.h"
+#include "llmultifloater.h"
 #include "lltexteditor.h"
-#include "llmultifloater.h" // <FS:Ansariel> Multi item properties floater
 
 class LLInventoryCategoriesObserver;
 class LLInventoryCategoryAddedObserver;
@@ -228,12 +228,10 @@ public:
 private:
 };
 
-// <FS:Ansariel> Multi item properties floater
 class LLMultiItemProperties : public LLMultiFloater
 {
 public:
 	LLMultiItemProperties(const LLSD& key);
 };
-// </FS:Ansariel>
 
 #endif // LL_LLFLOATERMARKETPLACELISTINGS_H
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 62f81fc43e..ab1c590279 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -999,14 +999,6 @@ void LLInvFVBridge::getClipboardEntries(bool show_asset_id,
 
 	addDeleteContextMenuOptions(items, disabled_items);
 
-	// If multiple items are selected, disable properties (if it exists).
-	// <FS> Old, standalone properties floater
-	//if ((flags & FIRST_SELECTED_ITEM) == 0)
-	//{
-	//	disabled_items.push_back(std::string("Properties"));
-	//}
-	// </FS>
-
 	LLInventoryPanel *active_panel = LLInventoryPanel::getActiveInventoryPanel(FALSE);
 	// <FS:Zi> Don't offer "Show in Main View" for folders opened in separate inventory views
 	//         as there are no tabs to switch to
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index 223385571c..ea6bc0b29c 100644
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -49,6 +49,7 @@
 #include "llclipboard.h"
 #include "lldirpicker.h"
 #include "lldonotdisturbnotificationstorage.h"
+#include "llfloatermarketplacelistings.h"
 #include "llfloatersidepanelcontainer.h"
 #include "llfocusmgr.h"
 #include "llfolderview.h"
@@ -2842,8 +2843,8 @@ void LLInventoryAction::doToSelected(LLInventoryModel* model, LLFolderView* root
 
 
 	LLMultiPreview* multi_previewp = NULL;
+	LLMultiItemProperties* multi_itempropertiesp = nullptr;
 	LLMultiProperties* multi_propertiesp = NULL; // <FS:Ansariel> Keep legacy properties floater
-	LLMultiItemProperties* multi_itempropertiesp = nullptr; // <FS:Ansariel> Multi item properties floater
 
 	if (("task_open" == action  || "open" == action) && selected_items.size() > 1)
 	{
@@ -2878,8 +2879,9 @@ void LLInventoryAction::doToSelected(LLInventoryModel* model, LLFolderView* root
 	else if (("task_properties" == action || "properties" == action) && selected_items.size() > 1)
 	{
 		// <FS:Ansariel> Keep legacy properties floater
-        //// Isn't supported (previously used LLMultiProperties)
-        //LL_WARNS() << "Tried to open properties for multiple items" << LL_ENDL;
+		//multi_itempropertiesp = new LLMultiItemProperties("item_properties");
+		//gFloaterView->addChild(multi_itempropertiesp);
+		//LLFloater::setFloaterHost(multi_itempropertiesp);
 		if (gSavedSettings.getBOOL("FSUseLegacyObjectProperties"))
 		{
 			multi_propertiesp = new LLMultiProperties();
@@ -3071,15 +3073,15 @@ void LLInventoryAction::doToSelected(LLInventoryModel* model, LLFolderView* root
 	{
 		multi_previewp->openFloater(LLSD());
 	}
+	else if (multi_itempropertiesp)
+	{
+		multi_itempropertiesp->openFloater(LLSD());
+	}
 	// <FS:Ansariel> Keep legacy properties floater
 	else if (multi_propertiesp)
 	{
 		multi_propertiesp->openFloater(LLSD());
 	}
-	else if (multi_itempropertiesp)
-	{
-		multi_itempropertiesp->openFloater(LLSD());
-	}
 	// </FS:Ansariel>
 }