diff --git a/editor/src/messages/portfolio/document/document_message_handler.rs b/editor/src/messages/portfolio/document/document_message_handler.rs
index 15c9958a..b8873247 100644
--- a/editor/src/messages/portfolio/document/document_message_handler.rs
+++ b/editor/src/messages/portfolio/document/document_message_handler.rs
@@ -1126,6 +1126,10 @@ impl DocumentMessageHandler {
 		self.current_hash() == self.saved_hash
 	}
 
+	pub fn is_graph_overlay_open(&self) -> bool {
+		self.graph_view_overlay_open
+	}
+
 	pub fn set_auto_save_state(&mut self, is_saved: bool) {
 		if is_saved {
 			self.auto_saved_hash = self.current_hash();
diff --git a/editor/src/messages/portfolio/portfolio_message_handler.rs b/editor/src/messages/portfolio/portfolio_message_handler.rs
index 8c4d14e8..5f166b8f 100644
--- a/editor/src/messages/portfolio/portfolio_message_handler.rs
+++ b/editor/src/messages/portfolio/portfolio_message_handler.rs
@@ -430,6 +430,7 @@ impl MessageHandler<PortfolioMessage, (&InputPreprocessorMessageHandler, &Prefer
 			}
 			PortfolioMessage::SelectDocument { document_id } => {
 				// Auto-save the document we are leaving
+				let mut node_graph_open = false;
 				if let Some(document) = self.active_document() {
 					if !document.is_auto_saved() {
 						responses.add(PortfolioMessage::AutoSaveDocument {
@@ -437,6 +438,7 @@ impl MessageHandler<PortfolioMessage, (&InputPreprocessorMessageHandler, &Prefer
 							document_id: self.active_document_id.unwrap(),
 						});
 					}
+					node_graph_open = document.is_graph_overlay_open();
 				}
 
 				// Set the new active document ID
@@ -451,6 +453,7 @@ impl MessageHandler<PortfolioMessage, (&InputPreprocessorMessageHandler, &Prefer
 				responses.add(PortfolioMessage::UpdateDocumentWidgets);
 				responses.add(NavigationMessage::TranslateCanvas { delta: (0., 0.).into() });
 				responses.add(NodeGraphMessage::RunDocumentGraph);
+				responses.add(DocumentMessage::GraphViewOverlay { open: node_graph_open });
 			}
 			PortfolioMessage::SubmitDocumentExport {
 				file_name,