diff --git a/Program.cs b/Program.cs
index 61edc9b3..161a0035 100644
--- a/Program.cs
+++ b/Program.cs
@@ -202,8 +202,8 @@ namespace GHelper
                 case 88:  // Plugged
                     settingsForm.BeginInvoke(delegate
                     {
-                        settingsForm.AutoGPUMode(1);
                         settingsForm.AutoScreen(1);
+                        settingsForm.AutoGPUMode(1);
                     });
                     return;
 
diff --git a/Settings.cs b/Settings.cs
index 0deef766..5394a02c 100644
--- a/Settings.cs
+++ b/Settings.cs
@@ -345,7 +345,7 @@ namespace GHelper
             if (HardwareMonitor.cpuTemp > 0)
                 cpuTemp = ": " + Math.Round((decimal)HardwareMonitor.cpuTemp).ToString() + "°C - ";
 
-            if (HardwareMonitor.batteryDischarge > 0)
+            if (HardwareMonitor.batteryDischarge > 1)
                 battery = "Discharging: " + Math.Round((decimal)HardwareMonitor.batteryDischarge, 1).ToString() + "W";
 
             Program.settingsForm.BeginInvoke(delegate