diff --git a/checkin_notes b/checkin_notes
index 4b782a4da9..040010c389 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -6622,3 +6622,12 @@ Charlie 23 June 2007
         cs_statefile.C
     lib/
         filesys.C
+
+Charlie 24 June 2007
+    Mac: Fix bugs when user chooses Quit from menubar icon menu and 
+        then cancels in confirmation dialog.
+    
+    clientgui/
+        BOINCTaskBar.cpp
+        mac/
+            MacSysMenu.cpp
diff --git a/clientgui/BOINCTaskBar.cpp b/clientgui/BOINCTaskBar.cpp
index 352159fc17..b13d90eda0 100644
--- a/clientgui/BOINCTaskBar.cpp
+++ b/clientgui/BOINCTaskBar.cpp
@@ -277,7 +277,10 @@ void CTaskBarIcon::OnAbout(wxCommandEvent& WXUNUSED(event)) {
 void CTaskBarIcon::OnExit(wxCommandEvent& event) {
     wxLogTrace(wxT("Function Start/End"), wxT("CTaskBarIcon::OnExit - Function Begin"));
 
-    if (wxGetApp().ConfirmExit()) {
+#ifndef __WXMAC__
+    if (wxGetApp().ConfirmExit()) 
+#endif
+    {
         wxCloseEvent eventClose;
         OnClose(eventClose);
         if (eventClose.GetSkipped()) event.Skip();
diff --git a/clientgui/mac/MacSysMenu.cpp b/clientgui/mac/MacSysMenu.cpp
index ee1096e84c..173d0b8aaf 100644
--- a/clientgui/mac/MacSysMenu.cpp
+++ b/clientgui/mac/MacSysMenu.cpp
@@ -314,7 +314,12 @@ pascal OSStatus SysMenuEventHandler( EventHandlerCallRef inHandlerCallRef,
                 commandID = wxID_PREFERENCES;
                 break;
             case kHICommandQuit:
-                commandID = wxID_EXIT;
+                if (wxGetApp().ConfirmExit()) {
+                    commandID = wxID_EXIT;
+                } else {
+                    commandID = 0;
+                    return noErr;
+                }
                 break;
             }