2 files changed, 19 insertions, 3 deletions

diff --git a/apps/debug_menu.c b/apps/debug_menu.c
index 8cf41037f1..9ab505061e 100644
--- a/apps/debug_menu.c
+++ b/apps/debug_menu.c
@@ -31,6 +31,7 @@
 #include "adc.h"
 #include "mas.h"
 #include "power.h"
+#include "usb.h"
 #include "rtc.h"
 #include "debug.h"
 #include "thread.h"
@@ -1470,7 +1471,11 @@ static bool view_runtime(void)
 
         if (state & 1) {
 #ifdef HAVE_CHARGING
-            if (charger_inserted())
+            if (charger_inserted()
+#ifdef HAVE_USB_POWER
+                    || usb_powered()
+#endif
+                    )
             {
                 global_settings.runtime = 0;
             }
diff --git a/firmware/backlight.c b/firmware/backlight.c
index d7c22956fb..9d48f0d660 100644
--- a/firmware/backlight.c
+++ b/firmware/backlight.c
@@ -409,7 +409,11 @@ static void backlight_tick(void)
 {
 #ifdef HAVE_CHARGING
     static bool charger_was_inserted = false;
-    bool charger_is_inserted = charger_inserted();
+    bool charger_is_inserted = charger_inserted()
+#ifdef HAVE_USB_POWER
+        || usb_powered()
+#endif
+        ;
 
     if( charger_was_inserted != charger_is_inserted )
     {
@@ -483,7 +487,14 @@ void backlight_off(void)
 int backlight_get_current_timeout(void)
 {
 #ifdef HAVE_CHARGING
-    return charger_inserted() ? backlight_timeout_plugged : backlight_timeout;
+    if (charger_inserted()
+#ifdef HAVE_USB_POWER
+            || usb_powered()
+#endif
+        )
+        return backlight_timeout_plugged;
+    else
+        return backlight_timeout;
 #else
     return backlight_timeout;
 #endif