diff --git a/checkin_notes b/checkin_notes
index 1d7b719385..a4d7967826 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -743,3 +743,11 @@ Rom    Jan 21 2008
         
     clientgui/
         ProjectListCtrl.cpp
+
+Rom    Jan 21 2008
+    - MGR: Make sure the attach to project wizard launches if BOINC
+        is not attached to any projects.
+        
+    clientgui/
+        AdvancedFrame.cpp
+        sg_BoincSimpleGUI.cpp
diff --git a/clientgui/AdvancedFrame.cpp b/clientgui/AdvancedFrame.cpp
index a32fead76a..ec0610ed6e 100644
--- a/clientgui/AdvancedFrame.cpp
+++ b/clientgui/AdvancedFrame.cpp
@@ -1847,7 +1847,7 @@ void CAdvancedFrame::OnConnect(CFrameEvent& WXUNUSED(event)) {
             // If failure, display the messages tab
             m_pNotebook->SetSelection(ID_LIST_MESSAGESVIEW - ID_LIST_BASE);
         }
-    } else if (pis.url.size() && !status.disallow_attach) {
+    } else if ((pis.url.size() || (0 >= pDoc->GetProjectCount())) && !status.disallow_attach) {
         if (!IsShown()) {
             Show();
         }
diff --git a/clientgui/sg_BoincSimpleGUI.cpp b/clientgui/sg_BoincSimpleGUI.cpp
index d1963a420f..e802175e0a 100644
--- a/clientgui/sg_BoincSimpleGUI.cpp
+++ b/clientgui/sg_BoincSimpleGUI.cpp
@@ -413,7 +413,7 @@ void CSimpleFrame::OnConnect(CFrameEvent& WXUNUSED(event)) {
             // If successful, hide the main window
             Hide();
         }
-    } else if (pis.url.size() && !status.disallow_attach) {
+    } else if ((pis.url.size() || (0 >= pDoc->GetProjectCount())) && !status.disallow_attach) {
         if (!IsShown()) {
             Show();
         }