diff --git a/src/main.ts b/src/main.ts
index 011ad7e..9db91b3 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -60,7 +60,7 @@ export default class FolderNotesPlugin extends Plugin {
 								const folderPath = path.slice(0, -1);
 								breadcrumb.setAttribute('data-path', folderPath);
 								const folder = this.fmtpHandler?.modifiedFolders.get(folderPath);
-								if (folder) {
+								if (folder && this.settings.frontMatterTitle.path && this.settings.frontMatterTitle.enabled) {
 									breadcrumb.setAttribute('old-name', folder.name || '');
 									breadcrumb.innerText = folder.newName || '';
 								}
@@ -251,7 +251,7 @@ export default class FolderNotesPlugin extends Plugin {
 		}
 		fileExplorerItem = fileExplorerItem.querySelector('div.nav-folder-title-content')
 		if (!fileExplorerItem) { return; }
-		if (this.settings.frontMatterTitle.explorer) {
+		if (this.settings.frontMatterTitle.explorer && this.settings.frontMatterTitle.enabled) {
 			fileExplorerItem.innerText = name;
 			fileExplorerItem.setAttribute('old-name', folder.name);
 		} else {
diff --git a/src/settings.ts b/src/settings.ts
index d518caf..4a8bb86 100644
--- a/src/settings.ts
+++ b/src/settings.ts
@@ -403,6 +403,9 @@ export class SettingsTab extends PluginSettingTab {
 							if (this.plugin.fmtpHandler) {
 								this.plugin.updateBreadcrumbs(true);
 							}
+							this.plugin.app.vault.getFiles().forEach((file) => {
+								this.plugin.fmtpHandler?.handleRename({ id: '', result: false, path: file.path }, false);
+							});
 							this.plugin.fmtpHandler?.deleteEvent();
 							this.plugin.fmtpHandler = null;
 						}
@@ -423,7 +426,6 @@ export class SettingsTab extends PluginSettingTab {
 							this.plugin.app.vault.getFiles().forEach((file) => {
 								this.plugin.fmtpHandler?.handleRename({ id: '', result: false, path: file.path }, false);
 							});
-							this.display();
 						})
 				);
 
@@ -441,7 +443,6 @@ export class SettingsTab extends PluginSettingTab {
 							} else {
 								this.plugin.updateBreadcrumbs(true);
 							}
-							this.display();
 						})
 				);
 		}