diff --git a/indra/newview/llgroupnotify.cpp b/indra/newview/llgroupnotify.cpp
index b2b678878..e401e80a1 100644
--- a/indra/newview/llgroupnotify.cpp
+++ b/indra/newview/llgroupnotify.cpp
@@ -294,7 +294,8 @@ LLGroupNotifyBox::~LLGroupNotifyBox()
 // virtual
 BOOL LLGroupNotifyBox::handleRightMouseDown(S32 x, S32 y, MASK mask)
 {
-	moveToBack();
+	if (!LLPanel::handleRightMouseDown(x, y, mask))
+		moveToBack();
 	return TRUE;
 }
 
diff --git a/indra/newview/llnotify.cpp b/indra/newview/llnotify.cpp
index d60d53275..676124614 100644
--- a/indra/newview/llnotify.cpp
+++ b/indra/newview/llnotify.cpp
@@ -486,13 +486,9 @@ BOOL LLNotifyBox::handleMouseUp(S32 x, S32 y, MASK mask)
 // virtual
 BOOL LLNotifyBox::handleRightMouseDown(S32 x, S32 y, MASK mask)
 {
-	if (!mIsTip)
-	{
-		moveToBack(true);
-		return TRUE;
-	}
-
-	return LLPanel::handleRightMouseDown(x, y, mask);
+	bool done = LLPanel::handleRightMouseDown(x, y, mask);
+	if (!done && !mIsTip) moveToBack(true);
+	return done || !mIsTip;
 }