diff --git a/PowerManagementDaemon/ukui-power-test-tool/upower-dbus/upowerdbus.cpp b/PowerManagementDaemon/ukui-power-test-tool/upower-dbus/upowerdbus.cpp
index 35f2ae3647c9b3f4f050af5d308164475539760f..0e4494fae421fd9b9050e7ad8d28b5c38e87f209 100644
--- a/PowerManagementDaemon/ukui-power-test-tool/upower-dbus/upowerdbus.cpp
+++ b/PowerManagementDaemon/ukui-power-test-tool/upower-dbus/upowerdbus.cpp
@@ -42,7 +42,7 @@ UPowerDBus::UPowerDBus(QObject *parent) : QObject(parent)
             int upDeviceType = getDeviceType(dBusObjectPath.path());
             if (up_device_type_line_power == upDeviceType) {
                 m_linePowerPathList << dBusObjectPath.path();
-            } else if (up_device_type_battery == upDeviceType) {
+            } else if (up_device_type_battery == upDeviceType || up_device_type_ups == upDeviceType) {
                 m_batteryPathList << dBusObjectPath.path();
             }
         }
diff --git a/ukui-power-manager-tray/upower-dbus/upm_upowerdbus.cpp b/ukui-power-manager-tray/upower-dbus/upm_upowerdbus.cpp
index 7cddb23558928f11929c4fe8be9d3e813745b81d..ce8c00f8252ce85606dfb203cc67aba98a19abb0 100644
--- a/ukui-power-manager-tray/upower-dbus/upm_upowerdbus.cpp
+++ b/ukui-power-manager-tray/upower-dbus/upm_upowerdbus.cpp
@@ -215,7 +215,8 @@ void UpmUpowerDBus::onDeviceAdded(QDBusObjectPath devicePath)
 {
     const QString path = devicePath.path();
     qInfo() << "Device added:" << path;
-    if(m_upowerDBus->getDeviceType(path) == up_device_type_battery) {
+    int devType = m_upowerDBus->getDeviceType(path);
+    if(devType == up_device_type_battery || devType == up_device_type_ups) {
         rebuildBatteryObjects();
         Q_EMIT deviceChanged();
     }
@@ -225,7 +226,7 @@ void UpmUpowerDBus::onDeviceRemoved(QDBusObjectPath devicePath)
 {
     const QString path = devicePath.path();
     qInfo() << "Device removed:" << path;
-    if(path.contains("BAT")) {
+    if(path.contains("BAT") || path.contains("ups")) {
         rebuildBatteryObjects();
         Q_EMIT deviceChanged();
     }
diff --git a/ukui-power-manager-tray/upower-dbus/upowerdbus.cpp b/ukui-power-manager-tray/upower-dbus/upowerdbus.cpp
index 55e3b1dbf279e9fbaa8cabd5ba2e290b14075e6f..88ce542e11e99da3ccf27d6786d441d3aeac3b96 100644
--- a/ukui-power-manager-tray/upower-dbus/upowerdbus.cpp
+++ b/ukui-power-manager-tray/upower-dbus/upowerdbus.cpp
@@ -56,7 +56,7 @@ void UPowerDBus::refreshDevicePathLists()
             if (up_device_type_line_power == upDeviceType) {
                 m_linePowerPathList << dBusObjectPath.path();
                 qDebug() << "line_power dBusObjectPath:" << dBusObjectPath.path();
-            } else if (up_device_type_battery == upDeviceType) {
+            } else if (up_device_type_battery == upDeviceType || up_device_type_ups == upDeviceType) {
                 m_batteryPathList << dBusObjectPath.path();
                 qDebug() << "battery dBusObjectPath:" << dBusObjectPath.path();
             }
diff --git a/ukui-upower/upowerinfo/upowerinfo.cpp b/ukui-upower/upowerinfo/upowerinfo.cpp
index d5af4de7cb96265d6cb9338e287ff57fcd34e586..5e61b6297b17d0d875b38f57950343cea95b9bb9 100644
--- a/ukui-upower/upowerinfo/upowerinfo.cpp
+++ b/ukui-upower/upowerinfo/upowerinfo.cpp
@@ -160,7 +160,7 @@ QString UPowerInfo::getBatteryPath()
     if (dface.isValid()) {
         for (QDBusObjectPath op : reply.value()) {
             int upDeviceType = getDeviceType(op.path());
-            if (up_device_type_battery == upDeviceType) {
+            if (up_device_type_battery == upDeviceType || up_device_type_ups == upDeviceType) {
                 batteryPath = op.path();
                 m_hasBattery = true;
                 break;