diff --git a/indra/newview/llfloaterchat.cpp b/indra/newview/llfloaterchat.cpp
index 7e1cfcd73..60f67c1e0 100644
--- a/indra/newview/llfloaterchat.cpp
+++ b/indra/newview/llfloaterchat.cpp
@@ -179,13 +179,18 @@ void LLFloaterChat::handleVisibilityChange(BOOL new_visibility)
 	if (new_visibility)
 	{
 		LLFloaterChatterBox::getInstance()->setFloaterFlashing(this, FALSE);
-		// Work around the chat bar no longer focusing from within the layout_stack
-		gFocusMgr.setKeyboardFocus(getChildView("Chat Editor"));
 	}
 
 	LLFloater::handleVisibilityChange(new_visibility);
 }
 
+// virtual
+void LLFloaterChat::onFocusReceived()
+{
+	gFocusMgr.setKeyboardFocus(getChildView("Chat Editor")); // Work around the chat bar no longer focusing from within the layout_stack
+	LLFloater::onFocusReceived();
+}
+
 void LLFloaterChat::setMinimized(BOOL minimized)
 {
 	LLFloater::setMinimized(minimized);
diff --git a/indra/newview/llfloaterchat.h b/indra/newview/llfloaterchat.h
index a3ef23fd0..e1626a9f3 100644
--- a/indra/newview/llfloaterchat.h
+++ b/indra/newview/llfloaterchat.h
@@ -63,6 +63,7 @@ public:
 	virtual void draw();
 	virtual BOOL postBuild();
 	virtual void onClose(bool app_quitting);
+	virtual void onFocusReceived();
 	virtual void handleVisibilityChange(BOOL cur_visibility);
 	virtual void setMinimized(BOOL);
 	void updateConsoleVisibility();