diff --git a/src/functions/folderNoteFunctions.ts b/src/functions/folderNoteFunctions.ts
index a53a5a5..a507577 100644
--- a/src/functions/folderNoteFunctions.ts
+++ b/src/functions/folderNoteFunctions.ts
@@ -82,9 +82,13 @@ export async function createFolderNote(plugin: FolderNotesPlugin, folderPath: st
 		});
 	}
 
+	if (!extension) {
+		extension = folderNoteType;
+	}
+
 	if (!folderNote) {
 		let content = '';
-		if (extension !== '.md') {
+		if (extension !== '.md' && extension) {
 			if (plugin.settings.templatePath && folderNoteType.split('.').pop() === plugin.settings.templatePath.split('.').pop()) {
 				const templateFile = plugin.app.vault.getAbstractFileByPath(plugin.settings.templatePath);
 				if (templateFile instanceof TFile) {
diff --git a/src/suggesters/TemplateSuggester.ts b/src/suggesters/TemplateSuggester.ts
index 788c439..1988641 100644
--- a/src/suggesters/TemplateSuggester.ts
+++ b/src/suggesters/TemplateSuggester.ts
@@ -31,8 +31,6 @@ export class TemplateSuggest extends AbstractInputSuggest<TFile> {
 		const lower_input_str = input_str.toLowerCase();
 
 		if ((!templateFolder || templateFolder.trim() === '') && !templaterPlugin) {
-			console.log('Template folder not found');
-			console.log(lower_input_str);
 			files = this.plugin.app.vault.getFiles().filter((file) =>
 				file.path.toLowerCase().includes(lower_input_str)
 			);
@@ -61,9 +59,9 @@ export class TemplateSuggest extends AbstractInputSuggest<TFile> {
 		const { templateFolder, templaterPlugin } = getTemplatePlugins(this.app);
 
 		if ((!templateFolder || templateFolder.trim() === '') && !templaterPlugin) {
-			el.setText(`${file.parent?.path}/${file.name.replace('.md', '')}`);
+			el.setText(`${file.parent?.path !== '/' ? file.parent?.path + '/' : ''}${file.name}`);
 		} else {
-			el.setText(file.name.replace('.md', ''));
+			el.setText(file.name);
 		}
 	}