diff --git a/indra/newview/llsyswellwindow.cpp b/indra/newview/llsyswellwindow.cpp
index 374f4c69c0..bb7cacb6fa 100644
--- a/indra/newview/llsyswellwindow.cpp
+++ b/indra/newview/llsyswellwindow.cpp
@@ -147,9 +147,23 @@ void LLSysWellWindow::setVisible(BOOL visible)
 	{
 		if (NULL == getDockControl() && getDockTongue().notNull())
 		{
-			setDockControl(new LLDockControl(
-				LLChicletBar::getInstance()->getChild<LLView>(getAnchorViewName()), this,
-				getDockTongue(), LLDockControl::BOTTOM));
+			// <FS:Ansariel> Group notices, IMs and chiclets position
+			//setDockControl(new LLDockControl(
+			//	LLChicletBar::getInstance()->getChild<LLView>(getAnchorViewName()), this,
+			//	getDockTongue(), LLDockControl::BOTTOM));
+			if (gSavedSettings.getBOOL("InternalShowGroupNoticesTopRight"))
+			{
+				setDockControl(new LLDockControl(
+					LLChicletBar::getInstance()->getChild<LLView>(getAnchorViewName()), this,
+					getDockTongue(), LLDockControl::BOTTOM));
+			}
+			else
+			{
+				setDockControl(new LLDockControl(
+					LLChicletBar::getInstance()->getChild<LLView>(getAnchorViewName()), this,
+					getDockTongue(), LLDockControl::TOP));
+			}
+			// </FS:Ansariel> Group notices, IMs and chiclets position
 		}
 	}