diff --git a/GUI/Main.cs b/GUI/Main.cs
index 8e326861c2..6e935b7518 100644
--- a/GUI/Main.cs
+++ b/GUI/Main.cs
@@ -366,6 +366,9 @@ protected override void OnLoad(EventArgs e)
             CheckTrayState();
             InitRefreshTimer();
 
+            var winReg = new Win32Registry();
+            pauseToolStripMenuItem.Enabled = winReg.RefreshRate != 0;
+
             m_UpdateRepoWorker = new BackgroundWorker { WorkerReportsProgress = false, WorkerSupportsCancellation = true };
 
             m_UpdateRepoWorker.RunWorkerCompleted += PostUpdateRepo;
@@ -1134,9 +1137,13 @@ private void UpdateTrayState()
             {
                 minimizeNotifyIcon.Visible = true;
 
-                if (minimizeToTray && WindowState == FormWindowState.Minimized)
+                if (WindowState == FormWindowState.Minimized)
                 {
-                    Hide();
+                    if (minimizeToTray)
+                    {
+                        // Remove our taskbar entry
+                        Hide();
+                    }
                 }
                 else
                 {