diff --git a/src/battery.cpp b/src/battery.cpp
index 524f7da9..775b01d9 100644
--- a/src/battery.cpp
+++ b/src/battery.cpp
@@ -104,7 +104,7 @@ float BatteryStats::getPower() {
             state[i]=current_status;
         }
 
-        if (state[i] == "Charging" ||  state[i] == "Unknown") {
+        if (state[i] == "Charging" ||  state[i] == "Unknown" || state[i] == "Full") {
             return 0;
         }
 
@@ -171,7 +171,7 @@ float BatteryStats::getTimeRemaining(){
         if (current_now_vec.size() > 25)
             current_now_vec.erase(current_now_vec.begin());
     }
-    
+
     for(auto& current_now : current_now_vec){
         current += current_now;
     }
diff --git a/src/hud_elements.cpp b/src/hud_elements.cpp
index 5e702e67..f1cd241a 100644
--- a/src/hud_elements.cpp
+++ b/src/hud_elements.cpp
@@ -722,7 +722,7 @@ void HudElements::battery(){
                 ImGui::SameLine(0,1.0f);
                 ImGui::Text("%%");
             }
-            if (Battery_Stats.current_watt > 1.f) {
+            if (Battery_Stats.current_watt != 0) {
                 ImGui::TableNextColumn();
                 right_aligned_text(HUDElements.colors.text, HUDElements.ralign_width, "%.1f", Battery_Stats.current_watt);
                 ImGui::SameLine(0,1.0f);