diff --git a/indra/newview/llfloaterperformance.cpp b/indra/newview/llfloaterperformance.cpp
index e79e9d19b1..644e52c022 100644
--- a/indra/newview/llfloaterperformance.cpp
+++ b/indra/newview/llfloaterperformance.cpp
@@ -194,6 +194,12 @@ void LLFloaterPerformance::draw()
             populateObjectList();
         }
 
+        auto button = getChild<LLButton>("AutoTuneFPS");
+        if((bool)button->getToggleState() != LLPerfStats::tunables.userAutoTuneEnabled)
+        {
+            button->toggleState();
+        }
+
         mUpdateTimer->setTimerExpirySec(REFRESH_INTERVAL);
     }
     LLFloater::draw();