diff -r f940fe2a7c2b -r 898935080fd6 GUI/MainForm.cs
--- a/GUI/MainForm.cs	Fri Feb 19 18:33:08 2010 +0000
+++ b/GUI/MainForm.cs	Fri Feb 19 19:50:07 2010 +0000
@@ -134,6 +134,7 @@
       maxMenuItem.Checked = Config.Get(maxMenuItem.Name, true);
       limitMenuItem.Checked = Config.Get(limitMenuItem.Name, false);
 
+      startMinMenuItem.Checked = Config.Get(startMinMenuItem.Name, false); 
       minTrayMenuItem.Checked = Config.Get(minTrayMenuItem.Name, true);
       hddMenuItem.Checked = Config.Get(hddMenuItem.Name, true);
 
@@ -143,7 +144,18 @@
       tempMenuItem.Checked = Config.Get(tempMenuItem.Name, true);
       fansMenuItem.Checked = Config.Get(fansMenuItem.Name, true);
      
-      timer.Enabled = true;   
+      timer.Enabled = true;
+
+      if (startMinMenuItem.Checked) {
+        if (minTrayMenuItem.Checked) {
+          notifyIcon.Visible = true;
+        } else {
+          WindowState = FormWindowState.Minimized;
+          Show();
+        }
+      } else {
+        Show();
+      }
     }
 
     private void HardwareAdded(IHardware hardware) {
@@ -238,6 +250,7 @@
       Config.Set(maxMenuItem.Name, maxMenuItem.Checked);
       Config.Set(limitMenuItem.Name, limitMenuItem.Checked);
 
+      Config.Set(startMinMenuItem.Name, startMinMenuItem.Checked);
       Config.Set(minTrayMenuItem.Name, minTrayMenuItem.Checked);
       Config.Set(hddMenuItem.Name, hddMenuItem.Checked);
 
@@ -346,13 +359,13 @@
     }
 
     private void ToggleSysTray() {
-      if (Visible) {
-        notifyIcon.Visible = true;
-        Visible = false;        
-      } else {
+      if (notifyIcon.Visible) {
         Visible = true;
         notifyIcon.Visible = false;
-        Activate();
+        Activate(); 
+      } else {
+        notifyIcon.Visible = true;
+        Visible = false;           
       }
     }
 
@@ -382,6 +395,5 @@
 
       sensorSystemTray.Remove(sensor);
     }
-
   }
 }