diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index dfade86ba..be2218997 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -1816,7 +1816,6 @@ impl Editor {
         if !force && doc.is_modified() {
             return Err(CloseError::BufferModified(doc.display_name().into_owned()));
         }
-        let doc = self.documents.remove(&doc_id).unwrap();
 
         // This will also disallow any follow-up writes
         self.saves.remove(&doc_id);
@@ -1857,6 +1856,8 @@ impl Editor {
             }
         }
 
+        let doc = self.documents.remove(&doc_id).unwrap();
+
         // If the document we removed was visible in all views, we will have no more views. We don't
         // want to close the editor just for a simple buffer close, so we need to create a new view
         // containing either an existing document, or a brand new document.