diff --git a/frontend/drivers/platform_win32.c b/frontend/drivers/platform_win32.c
index 4b69b5ff03..b7da98da6d 100644
--- a/frontend/drivers/platform_win32.c
+++ b/frontend/drivers/platform_win32.c
@@ -214,6 +214,10 @@ enum frontend_powerstate frontend_win32_get_powerstate(int *seconds, int *percen
 	*percent  = (int)status.BatteryLifePercent;
 	*seconds  = (int)status.BatteryLifeTime;
 
+#ifdef _WIN32
+      if (*percent == 255)
+         *percent = 0;
+#endif
 	return ret;
 }
 
diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index c5efdd5de0..fd5bfd0696 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -2623,10 +2623,6 @@ static void xmb_frame(void *data)
 
       *msg = '\0';
 
-#ifdef _WIN32
-      if (percent == 255)
-         percent = 0;
-#endif
       if (percent > 0)
       {
          size_t x_pos = xmb->icon.size / 6;