diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 28f746f182..01bafdc504 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -15404,6 +15404,7 @@ Change of this parameter will affect the layout of buttons in notification toast
 	      <string>nearby_chat</string>
 	      <string>im_container</string>
 		  <string>beacons</string>
+        <string>stats</string>
       </array>
     </map>
     <key>LandmarksSortedByDate</key>
@@ -16779,5 +16780,16 @@ Change of this parameter will affect the layout of buttons in notification toast
     <key>Value</key>
     <integer>0</integer>
   </map>
+  <key>FSShowStatsBarInMouselook</key>
+  <map>
+    <key>Comment</key>
+    <string>Makes it so that the statistics bar stays visible when entering mouselook if it was open already.</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
 </map>
 </llsd>
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 777db5e2b6..925ffadf98 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -2065,10 +2065,18 @@ void LLAgent::endAnimationUpdateUI()
 #if 0 // Use this once all floaters are registered
 		std::set<std::string> exceptions;
 		exceptions.insert("mini_map");
+		if(gSavedSettings.getBOOL("FSShowStatsBarInMouselook"))
+		{
+			exceptions.insert("stats");
+		}
 		LLFloaterReg::hideVisibleInstances(exceptions);
 #else // Use this for now
 		LLFloaterView::skip_list_t skip_list;
 		skip_list.insert(LLFloaterReg::findInstance("mini_map"));
+		if(gSavedSettings.getBOOL("FSShowStatsBarInMouselook"))
+		{
+			skip_list.insert(LLFloaterReg::findInstance("stats"));
+		}
 		gFloaterView->pushVisibleAll(FALSE, skip_list);
 #endif