diff --git a/applets/batterymonitor/package/contents/code/logic.js b/applets/batterymonitor/package/contents/code/logic.js
index ca5bace89..a5ac7f007 100755
--- a/applets/batterymonitor/package/contents/code/logic.js
+++ b/applets/batterymonitor/package/contents/code/logic.js
@@ -159,7 +159,7 @@ function updateTooltip(remainingTime) {
     } else if (batteries.allCharged) {
         batteries.tooltipImage = "battery-100";
         batteries.tooltipMainText = i18n("Fully Charged");
-    } else if (batteries.charging) {
+    } else if (pmSource.data["AC Adapter"] && pmSource.data["AC Adapter"]["Plugged in"]) {
         batteries.tooltipImage = "battery-charging"
         batteries.tooltipMainText = i18n("%1%. Charging", batteries.cumulativePercent);
     } else {