diff --git a/checkin_notes b/checkin_notes
index 708b618e49..3121d11bac 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -4064,3 +4064,10 @@ David  2 Jun 2010
         cs_prefs.cpp
         log_flags.cpp,h
         sim.h
+
+Rom    2 Jun 2010
+    - MGR: When starting up and attaching to a project for the first time,
+        show the correct tab if in the advanced view.
+        
+    clientgui/
+        AdvancedFrame.cpp
diff --git a/clientgui/AdvancedFrame.cpp b/clientgui/AdvancedFrame.cpp
index 6ec3d4e5ea..ea437b9245 100644
--- a/clientgui/AdvancedFrame.cpp
+++ b/clientgui/AdvancedFrame.cpp
@@ -1807,10 +1807,10 @@ void CAdvancedFrame::OnConnect(CFrameEvent& WXUNUSED(event)) {
 
         if (pAPWizard->Run(strName, strURL, pis.team_name, bCachedCredentials)) {
             // If successful, display the work tab
-            m_pNotebook->SetSelection(ID_LIST_WORKVIEW - ID_LIST_BASE);
+            m_pNotebook->SetSelection(ID_ADVTASKSVIEW - ID_ADVVIEWBASE);
         } else {
-            // If failure, display the messages tab
-            m_pNotebook->SetSelection(ID_LIST_MESSAGESVIEW - ID_LIST_BASE);
+            // If failure, display the notices tab
+            m_pNotebook->SetSelection(ID_ADVNOTICESVIEW - ID_ADVVIEWBASE);
         }
     }