diff --git a/extras/Projucer/Source/Project/jucer_ConfigTree_Base.h b/extras/Projucer/Source/Project/jucer_ConfigTree_Base.h
index ec94b5a62b..512010188d 100644
--- a/extras/Projucer/Source/Project/jucer_ConfigTree_Base.h
+++ b/extras/Projucer/Source/Project/jucer_ConfigTree_Base.h
@@ -224,9 +224,9 @@ public:
 
     void closeSettingsPage()
     {
-        if (ProjectContentComponent* pcc = getProjectContentComponent())
+        if (auto* pcc = getProjectContentComponent())
         {
-            if (auto* content = dynamic_cast<Viewport*> (pcc->getEditorComponent()))
+            if (auto* content = dynamic_cast<Viewport*> (pcc->getEditorComponent()->getChildComponent (0)))
                 if (content->getViewedComponent()->getComponentID() == getUniqueName())
                     pcc->hideEditor();
         }
diff --git a/extras/Projucer/Source/Project/jucer_ConfigTree_Modules.h b/extras/Projucer/Source/Project/jucer_ConfigTree_Modules.h
index 54d17496ba..e4d08513a8 100644
--- a/extras/Projucer/Source/Project/jucer_ConfigTree_Modules.h
+++ b/extras/Projucer/Source/Project/jucer_ConfigTree_Modules.h
@@ -45,7 +45,11 @@ public:
         showSettingsPage (new ModuleSettingsPanel (project, moduleID));
     }
 
-    void deleteItem() override                { project.getModules().removeModule (moduleID); }
+    void deleteItem() override
+    {
+        closeSettingsPage();
+        project.getModules().removeModule (moduleID);
+    }
 
     Icon getIcon() const override
     {