diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index 86cc80bb03..6d28511dc9 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -1871,6 +1871,8 @@ void LLFloater::updateTitleButtons()
 				enabled = false;
 			}
 		}
+		
+		/*KC: don't do this, see below
 		if (i == BUTTON_CLOSE && mButtonScale != 1.f)
 		{
 			//*HACK: always render close button for hosted floaters so
@@ -1878,10 +1880,14 @@ void LLFloater::updateTitleButtons()
 			//closing multiple windows in the chatterbox
 			enabled = true;
 		}
+		*/
 
 		mButtons[i]->setEnabled(enabled);
 
-		if (enabled)
+		if (enabled
+		//KC: don't explictly force enable close button on
+		//hosted floaters instead drawing a disabled one
+		|| (i == BUTTON_CLOSE && mButtonScale != 1.f))
 		{
 			button_count++;