diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index 2c192df2a9..be20b8d9b4 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -1145,10 +1145,7 @@ BOOL LLTextBase::handleMouseDown(S32 x, S32 y, MASK mask)
 BOOL LLTextBase::handleMouseUp(S32 x, S32 y, MASK mask)
 {
 	LLTextSegmentPtr cur_segment = getSegmentAtLocalPos(x, y);
-	// <FS:Beq> FIRE-23523 left click does not work on notifications with embedded links	
-	// if (hasMouseCapture() && cur_segment && cur_segment->handleMouseUp(x, y, mask))
-	if (cur_segment && cur_segment->handleMouseUp(x, y, mask))
-	// </FS:Beq>
+	if (hasMouseCapture() && cur_segment && cur_segment->handleMouseUp(x, y, mask))
 	{
 		// Did we just click on a link?
 		if (mURLClickSignal
diff --git a/indra/llui/lltextbox.cpp b/indra/llui/lltextbox.cpp
index d0c82faf94..c2e399cacc 100644
--- a/indra/llui/lltextbox.cpp
+++ b/indra/llui/lltextbox.cpp
@@ -35,6 +35,8 @@
 #include "llurlregistry.h"
 #include "llstyle.h"
 
+#include "llmodaldialog.h"
+
 static LLDefaultChildRegistry::Register<LLTextBox> r("text");
 
 // Compiler optimization, generate extern template
@@ -71,7 +73,7 @@ BOOL LLTextBox::handleMouseDown(S32 x, S32 y, MASK mask)
 		// Route future Mouse messages here preemptively.  (Release on mouse up.)
 		// <FS> FIRE-10172: This interferes with the scroll bar buttons.
 		//gFocusMgr.setMouseCapture( this );
-		if (!gFocusMgr.getMouseCapture())
+		if (!gFocusMgr.getMouseCapture() || getParentByType<LLModalDialog>())
 			gFocusMgr.setMouseCapture( this );
 		// </FS>
 	}