diff --git a/Helpers/UPower.qml b/Helpers/UPower.qml
index ed9f1ad..2ba5579 100644
--- a/Helpers/UPower.qml
+++ b/Helpers/UPower.qml
@@ -10,4 +10,14 @@ Singleton {
 	readonly property list<UPowerDevice> devices: UPower.devices.values
 	readonly property bool onBattery: UPower.onBattery
 	readonly property UPowerDevice displayDevice: UPower.displayDevice
+
+	property UPowerDevice batteryDevice
+
+	function findDevice(): void {
+		for ( let i = 0; i < root.devices.length; i++ ) {
+			if ( root.devices[i].type === "Battery" ) {
+				root.batteryDevice = root.devices[i];
+			}
+		}
+	}
 }
diff --git a/Modules/UPower/UPowerWidget.qml b/Modules/UPower/UPowerWidget.qml
index ab0f860..4a7d311 100644
--- a/Modules/UPower/UPowerWidget.qml
+++ b/Modules/UPower/UPowerWidget.qml
@@ -12,16 +12,10 @@ Item {
 	anchors.top: parent.top
 	anchors.bottom: parent.bottom
 
-	function findDevice() {
-		for ( let i = 0; i < UPower.devices.count; i++ ) {
-			if ( UPower.devices[i].isLaptopBattery ) {
-				return UPower.devices[i];
-			}
-		}
-	}
+	Component.onCompleted: UPower.findDevice()
 
 	CustomText {
-		text: findDevice().percentage
+		text: UPower.batteryDevice.percentage + "%"
 		anchors.centerIn: parent
 	}
 }