5 files changed, 23 insertions, 1 deletions

diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index c2db1e6fb2..627fda8b12 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -12979,3 +12979,17 @@
     *: "Startup/Shutdown"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_KEYPRESS_RESTARTS_SLEEP_TIMER
+  desc: whether to restart running sleep timer on keypress
+  user: core
+  <source>
+    *: "Restart Sleep Timer On Keypress"
+  </source>
+  <dest>
+    *: "Restart Sleep Timer On Keypress"
+  </dest>
+  <voice>
+    *: "Restart Sleep Timer On Keypress"
+  </voice>
+</phrase>
diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c
index cce5dd751d..659a7f2fbb 100644
--- a/apps/menus/settings_menu.c
+++ b/apps/menus/settings_menu.c
@@ -439,13 +439,16 @@ MENUITEM_FUNCTION_DYNTEXT(sleep_timer_call, 0, sleep_timer, NULL,
                           /* make it look like a setting to the user */
 MENUITEM_SETTING(sleeptimer_on_startup,
                  &global_settings.sleeptimer_on_startup, NULL);
+MENUITEM_SETTING(keypress_restarts_sleeptimer,
+                 &global_settings.keypress_restarts_sleeptimer, NULL);
 
 MAKE_MENU(startup_shutdown_menu, ID2P(LANG_STARTUP_SHUTDOWN),
           0, Icon_System_menu,
             &start_screen,
             &poweroff,
             &sleep_timer_call,
-            &sleeptimer_on_startup
+            &sleeptimer_on_startup,
+            &keypress_restarts_sleeptimer
          );
 
 /*    STARTUP/SHUTDOWN MENU      */
diff --git a/apps/settings.c b/apps/settings.c
index 408e377e1a..39390f408e 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);
+    set_keypress_restarts_sleep_timer(
+        global_settings.keypress_restarts_sleeptimer);
 
 #if defined(BATTERY_CAPACITY_INC) && BATTERY_CAPACITY_INC > 0
     /* only call if it's really exchangable */
diff --git a/apps/settings.h b/apps/settings.h
index 7047b93709..65abcc54e8 100644
--- a/apps/settings.h
+++ b/apps/settings.h
@@ -800,6 +800,7 @@ struct user_settings
 
     int sleeptimer_duration;
     bool sleeptimer_on_startup;
+    bool keypress_restarts_sleeptimer;
 
 #ifdef HAVE_MORSE_INPUT
     bool morse_input; /* text input method setting */
diff --git a/apps/settings_list.c b/apps/settings_list.c
index 54c0917cda..614ac50712 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -1808,6 +1808,8 @@ const struct settings_list settings[] = {
                 UNIT_MIN, 5, 300, 5, sleeptimer_formatter, NULL, NULL),
     OFFON_SETTING(0, sleeptimer_on_startup, LANG_SLEEP_TIMER_ON_POWER_UP, false,
                   "sleeptimer on startup", NULL),
+    OFFON_SETTING(0, keypress_restarts_sleeptimer, LANG_KEYPRESS_RESTARTS_SLEEP_TIMER, false,
+                  "keypress restarts sleeptimer", set_keypress_restarts_sleep_timer),
 #ifdef HAVE_TOUCHPAD_SENSITIVITY_SETTING
     CHOICE_SETTING(0, touchpad_sensitivity, LANG_TOUCHPAD_SENSITIVITY, 0,
                    "touchpad sensitivity", "normal,high", touchpad_set_sensitivity, 2,