diff --git a/ChangeLog b/ChangeLog
index a91fd115c..7d5fa0c13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@ Bug fixes:
 - #6831 Incorporating Sonar's major
 - #6837 Memory leaks on macOS system
 - #6838 Enterprise asks for serial key on Linux system
+- #6849 Auto-hide resets itself
 - #6846 TLS certificate is not created by default for Synergy Enterprise.
 
 Enhancements:
diff --git a/src/gui/src/AppConfig.cpp b/src/gui/src/AppConfig.cpp
index 1eae3dcfe..cfeed4400 100644
--- a/src/gui/src/AppConfig.cpp
+++ b/src/gui/src/AppConfig.cpp
@@ -440,7 +440,7 @@ bool AppConfig::getCryptoEnabled() const {
 }
 
 void AppConfig::setAutoHide(bool b) {
-    setSettingModified(m_MinimizeToTray, b);
+    setSettingModified(m_AutoHide, b);
 }
 
 bool AppConfig::getAutoHide() { return m_AutoHide; }