diff --git a/indra/llui/llchatentry.cpp b/indra/llui/llchatentry.cpp
index 698f3d5e3f..0a4e4dda98 100755
--- a/indra/llui/llchatentry.cpp
+++ b/indra/llui/llchatentry.cpp
@@ -190,8 +190,11 @@ BOOL LLChatEntry::handleSpecialKey(const KEY key, const MASK mask)
     if (key == KEY_RETURN)
     {
         endOfDoc();
-        startSelection();
-        endSelection();
+		// <FS:Ansariel> FIRE-15334: Properly deselect
+        //startSelection();
+        //endSelection();
+		deselect();
+		// </FS:Ansariel>
     }
 
 	LLTextEditor::handleSpecialKey(key, mask);