diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp
index 988867ef84a1ef0781a0032e16cb80df98cef716..bd68d5286805e607bb8738523ca2fff8724fb77a 100644
--- a/indra/newview/llbottomtray.cpp
+++ b/indra/newview/llbottomtray.cpp
@@ -322,7 +322,7 @@ void LLBottomTray::setVisible(BOOL visible)
 
 			// Chat bar and gesture button are shown even in mouselook mode.
 			// But the move, camera and snapshot buttons shouldn't be displayed. See EXT-3988.
-			if ("chat_bar" == name || "gesture_panel" == name)
+			if ("chat_bar" == name || "gesture_panel" == name || (visibility && ("movement_panel" == name || "cam_panel" == name || "snapshot_panel" == name)))
 				continue;
 			else 
 			{