diff --git a/app/window/mainwindow/mainwindow.cpp b/app/window/mainwindow/mainwindow.cpp
index b9544a31b..a05d9e52e 100644
--- a/app/window/mainwindow/mainwindow.cpp
+++ b/app/window/mainwindow/mainwindow.cpp
@@ -341,6 +341,12 @@ void MainWindow::ProjectOpen(Project *p)
 
 void MainWindow::ProjectClose(Project *p)
 {
+  // Close project from NodeParamView
+  param_panel_->CloseContextsBelongingToProject(p);
+
+  // Close project from NodeView
+  node_panel_->CloseContextsBelongingToProject(p);
+
   // Close any nodes open in TimeBasedWidgets
   foreach (PanelWidget* panel, PanelManager::instance()->panels()) {
     TimeBasedPanel* tbp = dynamic_cast<TimeBasedPanel*>(panel);
@@ -368,12 +374,6 @@ void MainWindow::ProjectClose(Project *p)
       RemoveProjectPanel(panel);
     }
   }
-
-  // Close project from NodeView
-  node_panel_->CloseContextsBelongingToProject(p);
-
-  // Close project from NodeParamView
-  param_panel_->CloseContextsBelongingToProject(p);
 }
 
 void MainWindow::SetApplicationProgressStatus(ProgressStatus status)