diff --git a/indra/newview/llchatbar.cpp b/indra/newview/llchatbar.cpp
index d113cdc24..f0e0a1b06 100644
--- a/indra/newview/llchatbar.cpp
+++ b/indra/newview/llchatbar.cpp
@@ -187,6 +187,12 @@ BOOL LLChatBar::handleKeyHere( KEY key, MASK mask )
 			sendChat(CHAT_TYPE_SHOUT);
 			handled = TRUE;
 		}
+		else if (mask == MASK_SHIFT)
+		{
+			// whisper
+			sendChat( CHAT_TYPE_WHISPER );
+			handled = TRUE;
+		}
 		else if (mask == MASK_NONE)
 		{
 			// say