diff --git a/Helpers/UPower.qml b/Helpers/UPower.qml
index 2ba5579..d0159b7 100644
--- a/Helpers/UPower.qml
+++ b/Helpers/UPower.qml
@@ -11,12 +11,13 @@ Singleton {
 	readonly property bool onBattery: UPower.onBattery
 	readonly property UPowerDevice displayDevice: UPower.displayDevice
 
-	property UPowerDevice batteryDevice
+	property UPowerDevice batteryDevice: findDevice()
 
-	function findDevice(): void {
+	function findDevice(): UPowerDevice {
 		for ( let i = 0; i < root.devices.length; i++ ) {
+			console.log(root.devices[i])
 			if ( root.devices[i].type === "Battery" ) {
-				root.batteryDevice = root.devices[i];
+				return root.devices[i];
 			}
 		}
 	}
diff --git a/Modules/UPower/UPowerWidget.qml b/Modules/UPower/UPowerWidget.qml
index 4a7d311..6e8c10d 100644
--- a/Modules/UPower/UPowerWidget.qml
+++ b/Modules/UPower/UPowerWidget.qml
@@ -12,8 +12,6 @@ Item {
 	anchors.top: parent.top
 	anchors.bottom: parent.bottom
 
-	Component.onCompleted: UPower.findDevice()
-
 	CustomText {
 		text: UPower.batteryDevice.percentage + "%"
 		anchors.centerIn: parent