diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index 4f519afa06cce0a50fefa230e28c95e106e31ef2..79d8f90fec638a8b32c7d69aca9cf304d094330a 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -1360,6 +1360,7 @@ void LLFloater::bringToFront( S32 x, S32 y )
 // virtual
 void LLFloater::setVisibleAndFrontmost(BOOL take_focus)
 {
+	gFocusMgr.setTopCtrl(NULL);
 	setVisible(TRUE);
 	setFrontmost(take_focus);
 }