diff --git a/checkin_notes b/checkin_notes
index 58dfc7231d..11c025652d 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -8322,3 +8322,11 @@ Charlie 4 Sep 2007
     mac_build/
         boinc.xcodeproj/
             project.pbxproj
+
+Charlie 4 Sep 2007
+    - MGR: Fix #388: Snooze menu item is disabled and not checked if user 
+        selects RUN_MODE_NEVER; it is enabled and checked if user selects 
+        Snooze; otherwise it is enabled and not checked.
+
+    clientgui/
+        BOINCTaskBar.cpp
diff --git a/clientgui/BOINCTaskBar.cpp b/clientgui/BOINCTaskBar.cpp
index c8be153ac3..46056c877c 100644
--- a/clientgui/BOINCTaskBar.cpp
+++ b/clientgui/BOINCTaskBar.cpp
@@ -703,9 +703,16 @@ void CTaskBarIcon::AdjustMenuItems(wxMenu* pMenu) {
 
     pDoc->GetCoreClientStatus(status);
     if (RUN_MODE_NEVER == status.task_mode) {
-        pMenu->Check(ID_TB_SUSPEND, true);
+        if (status.task_mode_perm == status.task_mode) {
+            pMenu->Check(ID_TB_SUSPEND, false);
+            pMenu->Enable(ID_TB_SUSPEND, false);
+        } else {
+            pMenu->Check(ID_TB_SUSPEND, true);
+            pMenu->Enable(ID_TB_SUSPEND, true);
+        }
     } else {
         pMenu->Check(ID_TB_SUSPEND, false);
+        pMenu->Enable(ID_TB_SUSPEND, true);
     }
 }