diff --git a/apps/root_menu.c b/apps/root_menu.c
index aaddfa885a..747ba76c24 100644
--- a/apps/root_menu.c
+++ b/apps/root_menu.c
@@ -664,9 +664,6 @@ void root_menu(void)
             next_screen = GO_TO_ROOT;
 #endif
 
-    if (global_settings.sleeptimer_on_startup)
-        set_sleep_timer(global_settings.sleeptimer_duration * 60);
-
     while (true)
     {
         switch (next_screen)
diff --git a/apps/settings.c b/apps/settings.c
index 39390f408e..13913f2d85 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -844,6 +844,8 @@ void settings_apply(bool read_disk)
     dac_line_in(global_settings.line_in);
 #endif
     set_poweroff_timeout(global_settings.poweroff);
+    if (global_settings.sleeptimer_on_startup)
+        set_sleep_timer(global_settings.sleeptimer_duration * 60);
     set_keypress_restarts_sleep_timer(
         global_settings.keypress_restarts_sleeptimer);