diff --git a/src/SharpIDE.Application/Features/FilePersistence/IdeOpenTabsFileManager.cs b/src/SharpIDE.Application/Features/FilePersistence/IdeOpenTabsFileManager.cs
index 0c78f5c..8a47d23 100644
--- a/src/SharpIDE.Application/Features/FilePersistence/IdeOpenTabsFileManager.cs
+++ b/src/SharpIDE.Application/Features/FilePersistence/IdeOpenTabsFileManager.cs
@@ -70,6 +70,11 @@ public class IdeOpenTabsFileManager
 			await SaveFileAsync(file);
 		}
 	}
+
+	public void CloseFile(SharpIdeFile file)
+	{
+		_openFiles.TryRemove(file, out _);
+	}
 }
 
 #pragma warning restore VSTHRD011
diff --git a/src/SharpIDE.Godot/Features/CodeEditor/SharpIdeCodeEdit.cs b/src/SharpIDE.Godot/Features/CodeEditor/SharpIdeCodeEdit.cs
index 446aaae..21716e7 100644
--- a/src/SharpIDE.Godot/Features/CodeEditor/SharpIdeCodeEdit.cs
+++ b/src/SharpIDE.Godot/Features/CodeEditor/SharpIdeCodeEdit.cs
@@ -126,6 +126,7 @@ public partial class SharpIdeCodeEdit : CodeEdit
 	{
 		_currentFile?.FileContentsChangedExternally.Unsubscribe(OnFileChangedExternally);
 		GlobalEvents.Instance.SolutionAltered.Unsubscribe(OnSolutionAltered);
+		_openTabsFileManager.CloseFile(_currentFile!);
 	}
 
 	private void OnBreakpointToggled(long line)