diff --git a/indra/newview/llnamebox.cpp b/indra/newview/llnamebox.cpp
index 266dc52bb..28a465a57 100644
--- a/indra/newview/llnamebox.cpp
+++ b/indra/newview/llnamebox.cpp
@@ -70,12 +70,13 @@ BOOL LLNameBox::handleRightMouseDown(S32 x, S32 y, MASK mask)
 // virtual
 BOOL LLNameBox::handleHover(S32 x, S32 y, MASK mask)
 {
+	auto handled = LLTextBox::handleHover(x, y, mask);
 	if (mAllowInteract)
 	{
 		getWindow()->setCursor(UI_CURSOR_HAND);
-		return true;
+		handled = true;
 	}
-	return LLTextBox::handleHover(x, y, mask);
+	return handled;
 }
 
 // virtual
diff --git a/indra/newview/llnameeditor.cpp b/indra/newview/llnameeditor.cpp
index 3f08bcce9..e69161cbe 100644
--- a/indra/newview/llnameeditor.cpp
+++ b/indra/newview/llnameeditor.cpp
@@ -94,12 +94,13 @@ BOOL LLNameEditor::handleRightMouseDown(S32 x, S32 y, MASK mask)
 // virtual
 BOOL LLNameEditor::handleHover(S32 x, S32 y, MASK mask)
 {
-	if (mAllowInteract)
+	auto handled = LLLineEditor::handleHover(x, y, mask);
+	if (mAllowInteract && mClickForProfile && !mIsSelecting)
 	{
 		getWindow()->setCursor(UI_CURSOR_HAND);
-		return true;
+		handled = true;
 	}
-	return LLLineEditor::handleHover(x, y, mask);
+	return handled;
 }
 
 void LLNameEditor::displayAsLink(bool link)