diff --git a/checkin_notes b/checkin_notes
index 84ffcab852..56c5d620e8 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -2850,3 +2850,10 @@ David  6 Mar 2009
         sched_array.cpp
         sched_send.cpp
         server_types.cpp
+
+Rom    6 Mar 2009
+    - MGR: Don't hide the main window after attaching to an account manager
+        if we don't support the system tray on that platform. refs #844
+        
+    clientgui/
+        AdvancedFrame.cpp
diff --git a/clientgui/AdvancedFrame.cpp b/clientgui/AdvancedFrame.cpp
index bf64cfadad..4b30991eff 100644
--- a/clientgui/AdvancedFrame.cpp
+++ b/clientgui/AdvancedFrame.cpp
@@ -1787,8 +1787,11 @@ void CAdvancedFrame::OnConnect(CFrameEvent& WXUNUSED(event)) {
 
         pAMWizard = new CWizardAccountManager(this);
         if (pAMWizard->Run()) {
+
+#if defined(__WXMSW__) || defined(__WXMAC__)
             // If successful, hide the main window
             Hide();
+#endif
 
             // %s is the application name
             //    i.e. 'BOINC Manager', 'GridRepublic Manager'