diff --git a/packages/editor/CodeMirror/pluginApi/codeMirrorRequire.ts b/packages/editor/CodeMirror/pluginApi/codeMirrorRequire.ts
index 531d3a6f215..c9fb1c71f4d 100644
--- a/packages/editor/CodeMirror/pluginApi/codeMirrorRequire.ts
+++ b/packages/editor/CodeMirror/pluginApi/codeMirrorRequire.ts
@@ -5,11 +5,14 @@ import * as codeMirrorLanguage from '@codemirror/language';
 import * as codeMirrorAutocomplete from '@codemirror/autocomplete';
 import * as codeMirrorCommands from '@codemirror/commands';
 import * as codeMirrorLint from '@codemirror/lint';
+import * as codeMirrorLangHtml from '@codemirror/lang-html';
+import * as codeMirrorLangMarkdown from '@codemirror/lang-markdown';
+import * as codeMirrorLanguageData from '@codemirror/language-data';
+
 import * as lezerHighlight from '@lezer/highlight';
 import * as lezerCommon from '@lezer/common';
 import * as lezerMarkdown from '@lezer/markdown';
-import * as codeMirrorLangHtml from '@codemirror/lang-html';
-import * as codeMirrorLanguageData from '@codemirror/language-data';
+
 
 // Exposes CodeMirror libraries to plugins.
 //
@@ -21,12 +24,14 @@ const libraryNameToPackage: Record<string, any> = {
 	'@codemirror/language': codeMirrorLanguage,
 	'@codemirror/autocomplete': codeMirrorAutocomplete,
 	'@codemirror/commands': codeMirrorCommands,
-	'@codemirror/highlight': lezerHighlight,
 	'@codemirror/lint': codeMirrorLint,
 	'@codemirror/lang-html': codeMirrorLangHtml,
+	'@codemirror/lang-markdown': codeMirrorLangMarkdown,
 	'@codemirror/language-data': codeMirrorLanguageData,
+
 	'@lezer/common': lezerCommon,
 	'@lezer/markdown': lezerMarkdown,
+	'@lezer/highlight': lezerHighlight,
 };
 
 const codeMirrorRequire = (library: string) => {
diff --git a/packages/generator-joplin/generators/app/templates/webpack.config.js b/packages/generator-joplin/generators/app/templates/webpack.config.js
index f58fa9142a7..cfd773b81de 100644
--- a/packages/generator-joplin/generators/app/templates/webpack.config.js
+++ b/packages/generator-joplin/generators/app/templates/webpack.config.js
@@ -227,9 +227,11 @@ const externalContentScriptLibraries = [
 	'@codemirror/highlight',
 	'@codemirror/lint',
 	'@codemirror/lang-html',
+	'@codemirror/lang-markdown',
 	'@codemirror/language-data',
 	'@lezer/common',
 	'@lezer/markdown',
+	'@lezer/highlight',
 ];
 
 const extraScriptExternals = {};