diff --git a/checkin_notes b/checkin_notes
index 4379704162..0cd9fb4d97 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -1600,3 +1600,11 @@ Charlie 10 Feb 2012
 
     client/
         coproc_detect.cpp
+
+Charlie 11 Feb 2012
+    - MGR: Fix a bug which pushed modal dialogs (Attach Wizard) to rear when 
+        Manager process was brought to front from behind (Mac only.)  This 
+        bug was probably introduced in Z-order tweak of 23 Jan 2012.
+
+    clientgui/
+        BOINCGUIApp.cpp
diff --git a/clientgui/BOINCGUIApp.cpp b/clientgui/BOINCGUIApp.cpp
index 1f8c739379..a22e32c334 100644
--- a/clientgui/BOINCGUIApp.cpp
+++ b/clientgui/BOINCGUIApp.cpp
@@ -794,6 +794,13 @@ void CBOINCGUIApp::OnActivateApp(wxActivateEvent& event) {
             m_pEventLog->Raise();
         }
         m_pFrame->Raise();
+        
+#ifdef __WXMAC__
+        // Make sure any modal dialog (such as Attach Wizard) ends up in front.
+        if (IsModalDialogDisplayed()) {
+            wxDynamicCast(wxWindow::FindWindowById(ID_ANYDIALOG), wxDialog)->Raise();
+        }
+#endif
     }
     event.Skip();
 }