diff --git a/RetailCoder.VBE/UI/CodeExplorer/CodeExplorerDockablePresenter.cs b/RetailCoder.VBE/UI/CodeExplorer/CodeExplorerDockablePresenter.cs
index 2ee99e9462..0eb721941e 100644
--- a/RetailCoder.VBE/UI/CodeExplorer/CodeExplorerDockablePresenter.cs
+++ b/RetailCoder.VBE/UI/CodeExplorer/CodeExplorerDockablePresenter.cs
@@ -23,7 +23,12 @@ public CodeExplorerDockablePresenter(IRubberduckParser parser, VBE vbe, AddIn ad
         {
             _parser = parser;
             RegisterControlEvents();
-            Task.Run(() => RefreshExplorerTreeView());
+        }
+
+        public override void Show()
+        {
+            base.Show();
+            Task.Run(() => RefreshExplorerTreeView()); 
         }
 
         private void RegisterControlEvents()
@@ -210,18 +215,19 @@ private void AddProjectNodes(VBProject project, TreeNode root)
         {
             Control.Invoke((MethodInvoker)async delegate
             {
-                root.Text = project.Name;
                 if (project.Protection == vbext_ProjectProtection.vbext_pp_locked)
                 {
                     root.ImageKey = "Locked";
                 }
                 else
                 {
-                    root.ImageKey = "ClosedFolder";
                     var nodes = (await CreateModuleNodesAsync(project)).ToArray();
                     AddProjectFolders(project, root, nodes);
+                    root.ImageKey = "ClosedFolder";
                     root.Expand();
                 }
+
+                root.Text = project.Name;
             });
         }