diff --git a/jstat b/jstat
index 07c978c..2deb77f 100755
--- a/jstat
+++ b/jstat
@@ -40,7 +40,9 @@ while (true); do
 
     ### mouse charging
     # get state (eg "charging")
-    mouse_state="$(upower -i /org/freedesktop/UPower/devices/battery_hidpp_battery_6 | grep state | awk '{print $2}')"
+    #mouse_state="$(upower -i /org/freedesktop/UPower/devices/battery_hidpp_battery_6 | grep state | awk '{print $2}')"
+    battery_name=$(upower --dump | grep Device.*battery | awk '{print $2}')
+    mouse_state="$(upower -i $battery_name | grep state | awk '{print $2}')"
     # get charge percentage
     mouse_charge="$(upower -i /org/freedesktop/UPower/devices/battery_hidpp_battery_6 | grep percentage | awk '{print $2}')"
     # if the mouse is charging, set state to percentage.  otherwise dont show it ("")