diff --git a/indra/llui/llfloaterreg.cpp b/indra/llui/llfloaterreg.cpp
index 8a0513f24652f780cbe0cdbb360b4eaa0cf69623..27e96856b3e1f85d3a960be6a0c7a87151329ba3 100644
--- a/indra/llui/llfloaterreg.cpp
+++ b/indra/llui/llfloaterreg.cpp
@@ -483,7 +483,7 @@ void LLFloaterReg::toggleToolbarFloaterInstance(const LLSD& sdname)
 	{
 		showInstance(name, key, TRUE);
 	}
-	else if (!instance->hasFocus())
+	else if (!instance->hasFocus() && !instance->getIsChrome())
 	{
 		instance->setFocus(TRUE);
 	}