diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7cd042924e0443303f37e8544cce847d349d36a0..03f4f3e9dc35b27a276e84487e4885dbf7d4ba85 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Added
 
 ### Changed
+- settings: "Enable WiFi on Boot" option is now "Always-On Wi-Fi" (but is functionally identical), should help reduce confusion about Wi-Fi turning off automatically
 
 ### Fixed
 - updat3r: Improved version comparison logic, making the "you are up to date :)" logic work
diff --git a/python_payload/st3m/settings.py b/python_payload/st3m/settings.py
index 8a79056a89213948ba3b698338fe5d1d757ea068..611ea14afeefd2d976323bf8b7e21ccf26ea76a6 100644
--- a/python_payload/st3m/settings.py
+++ b/python_payload/st3m/settings.py
@@ -200,9 +200,9 @@ onoff_debug = OnOffTunable("Debug Overlay", "system.debug", False)
 onoff_debug_touch = OnOffTunable("Touch Overlay", "system.debug_touch", False)
 onoff_debug_ftop = OnOffTunable("Debug: ftop", "system.ftop_enabled", False)
 onoff_show_tray = OnOffTunable("Show Icons", "system.show_icons", True)
-onoff_wifi = OnOffTunable("Enable WiFi on Boot", "system.wifi.enabled", False)
+onoff_wifi = OnOffTunable("Always-On Wi-Fi", "system.wifi.enabled", False)
 onoff_wifi_preference = OnOffTunable(
-    "Let apps change WiFi", "system.wifi.allow_apps_to_change_wifi", True
+    "Let apps change Wi-Fi", "system.wifi.allow_apps_to_change_wifi", True
 )
 str_wifi_ssid = StringTunable("WiFi SSID", "system.wifi.ssid", None)
 str_wifi_psk = ObfuscatedStringTunable("WiFi Password", "system.wifi.psk", None)