diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index 16fb57c25..c8be07f43 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -571,6 +571,9 @@ void LLFloater::open()	/* Flawfinder: ignore */
 		setVisibleAndFrontmost(mAutoFocus);
 	}
 
+	if (!getControlName().empty())
+		setControlValue(true);
+
 	onOpen();
 }
 
@@ -633,6 +636,9 @@ void LLFloater::close(bool app_quitting)
 			}
 		}
 
+		if (!app_quitting && !getControlName().empty())
+			setControlValue(false);
+
 		// Let floater do cleanup.
 		onClose(app_quitting);
 	}