diff --git a/extras/Projucer/Source/Project/UI/jucer_ProjectContentComponent.cpp b/extras/Projucer/Source/Project/UI/jucer_ProjectContentComponent.cpp
index b8f2ec5b51..93b9d9df48 100644
--- a/extras/Projucer/Source/Project/UI/jucer_ProjectContentComponent.cpp
+++ b/extras/Projucer/Source/Project/UI/jucer_ProjectContentComponent.cpp
@@ -103,9 +103,10 @@ ProjectContentComponent::~ProjectContentComponent()
 
     ProjucerApplication::getApp().openDocumentManager.removeListener (this);
 
+    setProject (nullptr);
+
     logo.reset();
     header.reset();
-    setProject (nullptr);
     contentView.reset();
     fileNameLabel.reset();
     removeChildComponent (&bubbleMessage);
@@ -187,9 +188,7 @@ void ProjectContentComponent::setProject (Project* newProject)
 
         deleteProjectTabs();
         project = newProject;
-
-        if (project != nullptr)
-            rebuildProjectTabs();
+        rebuildProjectTabs();
     }
 }