diff --git a/ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx b/ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx
index bbd694aa91..8a80602754 100644
--- a/ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx
+++ b/ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx
@@ -359,6 +359,7 @@ function CodeMirror(props: NoteBodyEditorProps, ref: any) {
 			/* These must be important to prevent the codemirror defaults from taking over*/
 			.CodeMirror {
 				font-family: monospace;
+				font-size: ${theme.editorFontSize}px;
 				height: 100% !important;
 				width: 100% !important;
 				color: inherit !important;
diff --git a/ElectronClient/gui/Root.jsx b/ElectronClient/gui/Root.jsx
index 958d865bc7..53076f08d7 100644
--- a/ElectronClient/gui/Root.jsx
+++ b/ElectronClient/gui/Root.jsx
@@ -24,7 +24,7 @@ const { bridge } = require('electron').remote.require('./bridge');
 const GlobalStyle = createGlobalStyle`
 	div, span, a {
 		color: ${(props) => props.theme.color};
-		font-size: ${(props) => props.theme.fontSize}px;
+		/*font-size: ${(props) => props.theme.fontSize}px;*/
 		font-family: ${(props) => props.theme.fontFamily};
 	}
 `;