diff --git a/checkin_notes b/checkin_notes
index 0fd549299f..a9862884b4 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -1074,7 +1074,7 @@ Charlie 26 Jan 2012
         HowToBuildBOINC_XCode.rtf
 
 Charlie 27 Jan 2012
-    - MGR: If CPU or GPU is suspended from Activity Menu, change "Snooze" item 
+    - MGR: If CPU or GPU is suspended from Activity Menu, change "Snooze" items 
         to "Resume" in system tray menu.
     - client: Always remember previous CPU and GPU activity settings.
     
@@ -1105,3 +1105,9 @@ David  27 Jan 2012
 	clientgui/
 		BOINCBaseView.cpp
 		BOINCTaskCtrl.cpp
+
+Charlie 27 Jan 2012
+    - MGR: Disable new "Resume" items in system tray menu if modal dialog is open.
+
+    clientgui/
+        BOINCTaskBar.cpp
diff --git a/clientgui/BOINCTaskBar.cpp b/clientgui/BOINCTaskBar.cpp
index 271b701137..01e45bff88 100644
--- a/clientgui/BOINCTaskBar.cpp
+++ b/clientgui/BOINCTaskBar.cpp
@@ -592,7 +592,9 @@ void CTaskBarIcon::AdjustMenuItems(wxMenu* pMenu) {
         case RUN_MODE_NEVER:
             m_SnoozeMenuItem->SetItemLabel(_("Resume"));
             m_SnoozeMenuItem->Check(false);
-            m_SnoozeMenuItem->Enable(true);
+            if (!is_dialog_detected) {
+                m_SnoozeMenuItem->Enable(true);
+            }
             break;
         default:
             m_SnoozeMenuItem->SetItemLabel(_("Snooze"));
@@ -617,7 +619,9 @@ void CTaskBarIcon::AdjustMenuItems(wxMenu* pMenu) {
             case RUN_MODE_NEVER:
                 m_SnoozeGPUMenuItem->SetItemLabel(_("Resume GPU"));
                 m_SnoozeGPUMenuItem->Check(false);
-                m_SnoozeGPUMenuItem->Enable(true);
+                if (!is_dialog_detected) {
+                    m_SnoozeGPUMenuItem->Enable(true);
+                }
                 break;
             default:
                 m_SnoozeGPUMenuItem->SetItemLabel(_("Snooze GPU"));