diff --git a/i3pystatus/battery.py b/i3pystatus/battery.py
index 1fb3f0e..821404c 100644
--- a/i3pystatus/battery.py
+++ b/i3pystatus/battery.py
@@ -145,12 +145,12 @@ class BatteryChecker(IntervalModule):
         }
 
         status = battery.status()
-        if status in ["Discharging", "Charging"]:
+        if status in ["Charging", "Discharging"]:
             remaining = battery.remaining()
             fdict["remaining"] = TimeWrapper(remaining * 60, "%E%h:%M")
             if status == "Discharging":
                 fdict["status"] = "DIS"
-                if remaining < 15:
+                if battery.percentage() <= self.alert_percentage:
                     urgent = True
                     color = "#ff0000"
             else: