diff --git a/indra/newview/lltoast.cpp b/indra/newview/lltoast.cpp
index ad7b861a9d..74de8ffd54 100644
--- a/indra/newview/lltoast.cpp
+++ b/indra/newview/lltoast.cpp
@@ -405,6 +405,18 @@ void LLToast::setVisible(BOOL show)
 		{
 			mTimer->start();
 		}
+
+		// <FS:Ansariel> FIRE-17834: Local chat toasts sit above chat floater
+		if ((!mNotification.get() ||
+			(mNotification->getName() != "ScriptQuestion" &&
+			 mNotification->getName() != "ScriptQuestionCaution" &&
+			 mNotification->getName() != "ScriptQuestionExperience" &&
+			 mNotification->getName() != "UnknownScriptQuestion")) &&
+			 !getVisible())
+		{
+			LLModalDialog::setFrontmost(FALSE);
+		}
+		// </FS:Ansariel>
 	}
 	else
 	{