diff --git a/Barotrauma/BarotraumaClient/Source/Screens/SubEditorScreen.cs b/Barotrauma/BarotraumaClient/Source/Screens/SubEditorScreen.cs
index 25cbbc9d4..fb95c2152 100644
--- a/Barotrauma/BarotraumaClient/Source/Screens/SubEditorScreen.cs
+++ b/Barotrauma/BarotraumaClient/Source/Screens/SubEditorScreen.cs
@@ -564,6 +564,9 @@ namespace Barotrauma
 
             MapEntityPrefab.Selected = null;
 
+            saveFrame = null;
+            loadFrame = null;
+
             MapEntity.DeselectAll();
             MapEntity.SelectionGroups.Clear();