diff --git a/editor/src/document/document_message_handler.rs b/editor/src/document/document_message_handler.rs
index 13e8fdc7..aa3a26c0 100644
--- a/editor/src/document/document_message_handler.rs
+++ b/editor/src/document/document_message_handler.rs
@@ -249,7 +249,9 @@ impl MessageHandler<DocumentsMessage, &InputPreprocessor> for DocumentsMessageHa
 			NewDocument => {
 				let name = self.generate_new_document_name();
 				let new_document = DocumentMessageHandler::with_name(name, ipp);
-				self.load_document(new_document, generate_uuid(), false, responses);
+				let document_id = generate_uuid();
+				self.active_document_id = document_id;
+				self.load_document(new_document, document_id, false, responses);
 			}
 			OpenDocument => {
 				responses.push_back(FrontendMessage::OpenDocumentBrowse.into());