diff --git a/Modules/Bar/Widgets/Battery.qml b/Modules/Bar/Widgets/Battery.qml
index bb112e0..5bc8bfa 100644
--- a/Modules/Bar/Widgets/Battery.qml
+++ b/Modules/Bar/Widgets/Battery.qml
@@ -68,14 +68,20 @@ Item {
   Connections {
     target: UPower.displayDevice
     function onPercentageChanged() {
-      root.maybeNotify(percent, charging)
+      var currentPercent = UPower.displayDevice.percentage * 100
+      var isCharging = UPower.displayDevice.state === UPowerDeviceState.Charging
+      root.maybeNotify(currentPercent, isCharging)
     }
 
     function onStateChanged() {
+      var isCharging = UPower.displayDevice.state === UPowerDeviceState.Charging
       // Reset notification flag when charging starts
-      if (charging) {
+      if (isCharging) {
         root.hasNotifiedLowBattery = false
       }
+      // Also re-evaluate maybeNotify, as state might have changed
+      var currentPercent = UPower.displayDevice.percentage * 100
+      root.maybeNotify(currentPercent, isCharging)
     }
   }
 
diff --git a/Services/PowerProfileService.qml b/Services/PowerProfileService.qml
index 950e4ee..1447227 100644
--- a/Services/PowerProfileService.qml
+++ b/Services/PowerProfileService.qml
@@ -52,7 +52,11 @@ Singleton {
     target: powerProfiles
     function onProfileChanged() {
       root.profile = powerProfiles.profile
-      ToastService.showNotice("Power Profile", root.profileName())
+      // Only show toast if we have a valid profile name (not "Unknown")
+      const profileName = root.profileName()
+      if (profileName !== "Unknown") {
+        ToastService.showNotice("Power Profile", profileName)
+      }
     }
   }
 }