diff --git a/src/lib/editorFile.js b/src/lib/editorFile.js
index fd5c385a1..71cbbabac 100644
--- a/src/lib/editorFile.js
+++ b/src/lib/editorFile.js
@@ -944,6 +944,10 @@ export default class EditorFile {
 		}
 	}
 
+	get headerSubtitle() {
+		return this.#getTitle();
+	}
+
 	/**
 	 *
 	 * @param {FileAction} action
diff --git a/src/lib/editorManager.js b/src/lib/editorManager.js
index 214483f53..af13262f6 100644
--- a/src/lib/editorManager.js
+++ b/src/lib/editorManager.js
@@ -633,6 +633,7 @@ async function EditorManager($header, $body) {
 		if (activeFileId === id) return;
 
 		const file = manager.getFile(id);
+		if (!file) return;
 
 		manager.activeFile?.tab.classList.remove("active");
 
@@ -684,6 +685,7 @@ async function EditorManager($header, $body) {
 		}
 
 		$header.text = file.filename;
+		$header.subText = file.headerSubtitle || "";
 		manager.onupdate("switch-file");
 		events.emit("switch-file", file);
 	}