diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 7524c2efca..e6542779c4 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -23285,6 +23285,17 @@ Change of this parameter will affect the layout of buttons in notification toast
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>FSUseStatsInsteadOfLagMeter</key>
+    <map>
+      <key>Comment</key>
+      <string>Clicking on traffic indicator (upper right) toggles Statistics window, not the Lag Meter window</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/llstatusbar.cpp b/indra/newview/llstatusbar.cpp
index 217a5db23c..6e747d43d6 100755
--- a/indra/newview/llstatusbar.cpp
+++ b/indra/newview/llstatusbar.cpp
@@ -928,7 +928,14 @@ void LLStatusBar::onVolumeChanged(const LLSD& newvalue)
 // <FS:PP> FIRE-6287: Clicking on traffic indicator toggles Lag Meter window
 void LLStatusBar::onBandwidthGraphButtonClicked()
 {
-	LLFloaterReg::toggleInstance("lagmeter");
+	if (gSavedSettings.getBOOL("FSUseStatsInsteadOfLagMeter"))
+	{
+		LLFloaterReg::toggleInstance("stats");
+	}
+	else
+	{
+		LLFloaterReg::toggleInstance("lagmeter");
+	}
 }
 // </FS:PP> FIRE-6287: Clicking on traffic indicator toggles Lag Meter window