diff --git a/indra/newview/llfloaterreporter.cpp b/indra/newview/llfloaterreporter.cpp
index 0faabce9e9..3e9e57f7a8 100755
--- a/indra/newview/llfloaterreporter.cpp
+++ b/indra/newview/llfloaterreporter.cpp
@@ -179,7 +179,7 @@ BOOL LLFloaterReporter::postBuild()
 	getChild<LLUICtrl>("reporter_field")->setValue(reporter);
 	
 	// <FS:Ansariel> FIRE-15218: Refresh screenshot button
-	getChild<LLButton>("refresh_screenshot")->setCommitCallback(boost::bind(&LLFloaterReporter::takeScreenshot, this));
+	getChild<LLButton>("refresh_screenshot")->setCommitCallback(boost::bind(&LLFloaterReporter::onUpdateScreenshot, this));
 
 	center();
 
@@ -867,6 +867,15 @@ void LLFloaterReporter::setPosBox(const LLVector3d &pos)
 	getChild<LLUICtrl>("pos_field")->setValue(pos_string);
 }
 
+// <FS:Ansariel> FIRE-15368: Don't include floater in screenshot update
+void LLFloaterReporter::onUpdateScreenshot()
+{
+	setVisible(FALSE);
+	takeScreenshot();
+	setVisible(TRUE);
+}
+// </FS:Ansariel>
+
 // void LLFloaterReporter::setDescription(const std::string& description, LLMeanCollisionData *mcd)
 // {
 // 	LLFloaterReporter *self = LLFloaterReg::findTypedInstance<LLFloaterReporter>("reporter");
diff --git a/indra/newview/llfloaterreporter.h b/indra/newview/llfloaterreporter.h
index d54e7f6ab0..06e4947d7c 100755
--- a/indra/newview/llfloaterreporter.h
+++ b/indra/newview/llfloaterreporter.h
@@ -122,6 +122,8 @@ private:
 	void callbackAvatarID(const uuid_vec_t& ids, const std::vector<LLAvatarName> names);
 	void setFromAvatarID(const LLUUID& avatar_id);
 	void onAvatarNameCache(const LLUUID& avatar_id, const LLAvatarName& av_name);
+	// <FS:Ansariel> FIRE-15368: Don't include floater in screenshot update
+	void onUpdateScreenshot();
 
 private:
 	EReportType		mReportType;