diff --git a/core/views/caves.py b/core/views/caves.py
index 82ab5d2..5b34551 100644
--- a/core/views/caves.py
+++ b/core/views/caves.py
@@ -478,14 +478,13 @@ def edit_entrance(request, path="", caveslug=None, entslug=None):
                 entrance.cached_primary_slug = slugname
                 entrance.filename = slugname + ".html"
             entrance.save()
+            entrance_letter.entrance = entrance
+            entrance_letter.save()
+            
             entrance_file = entrance.file_output()
             print(f"Online edit of entrance {entrance.slug}")
             cave_file = cave.file_output()
-            entrance.save()
             write_and_commit([entrance_file, cave_file], f"Online edit of entrance {entrance.slug}")
-            entrance_letter.entrance = entrance
-            if entslug is None:
-                entrance_letter.save()
             return HttpResponseRedirect("/" + cave.url)
     else:
         if entrance: