diff --git a/indra/newview/rlvui.cpp b/indra/newview/rlvui.cpp
index 8c44b9e667..46b70053d8 100644
--- a/indra/newview/rlvui.cpp
+++ b/indra/newview/rlvui.cpp
@@ -126,7 +126,7 @@ void RlvUIEnabler::onToggleEdit()
 			LLFloaterReg::hideInstance("beacons");
 
 		// Hide the build floater if it's currently visible
-		if (LLToolMgr::instance().inBuildMode())
+		if (LLFloaterReg::instanceVisible("build"))
 			LLToolMgr::instance().toggleBuildMode();
 	}