diff --git a/indra/newview/fsfloaterexport.cpp b/indra/newview/fsfloaterexport.cpp
index af4b8442bb..4e6bd43315 100644
--- a/indra/newview/fsfloaterexport.cpp
+++ b/indra/newview/fsfloaterexport.cpp
@@ -32,7 +32,6 @@
 
 #include "lfsimfeaturehandler.h"
 #include "llagent.h"
-//#include "llagentconstants.h"
 #include "llagentdata.h"
 #include "llavatarnamecache.h"
 #include "llbufferstream.h"
@@ -212,6 +211,15 @@ FSFloaterObjectExport::~FSFloaterObjectExport()
 	{
 		gIdleCallbacks.deleteFunction(FSFloaterObjectExport::onIdle, this);
 	}
+
+	for (const auto& object_id : mInventoryRequests)
+	{
+		LLViewerObject* object = gObjectList.findObject(object_id);
+		if (object)
+		{
+			object->removeInventoryListener(this);
+		}
+	}
 }
 
 BOOL FSFloaterObjectExport::postBuild()
@@ -1098,7 +1106,7 @@ void FSFloaterObjectExport::onExportFileSelected(const std::vector<std::string>&
 	if (!exportSelection())
 	{
 		LLNotificationsUtil::add("ExportFailed");
-		//closeFloater();
+		closeFloater();
 	}
 }