diff --git a/indra/newview/llpanelgroupnotices.cpp b/indra/newview/llpanelgroupnotices.cpp
index a9c403e927..3f8f299446 100644
--- a/indra/newview/llpanelgroupnotices.cpp
+++ b/indra/newview/llpanelgroupnotices.cpp
@@ -590,7 +590,13 @@ void LLPanelGroupNotices::processNotices(LLMessageSystem* msg)
 
 	mNoticesList->setNeedsSort(save_sort);
 	mNoticesList->updateSort();
-	mNoticesList->selectFirstItem();
+	// <FS:Ansariel> Don't do this while composing a new notice or you will lose it
+	//mNoticesList->selectFirstItem();
+	if (mPanelViewNotice->getVisible())
+	{
+		mNoticesList->selectFirstItem();
+	}
+	// </FS:Ansariel>
 }
 
 void LLPanelGroupNotices::onSelectNotice(LLUICtrl* ctrl, void* data)