diff --git a/client/homebrew/editor/editor.jsx b/client/homebrew/editor/editor.jsx
index 9cb8e0df9..0e5676364 100644
--- a/client/homebrew/editor/editor.jsx
+++ b/client/homebrew/editor/editor.jsx
@@ -268,14 +268,9 @@ const Editor = createClass({
 		this.forceUpdate();
 	},
 
-	renderEditorCSSLink : function(){
-		return <link href={`../homebrew/cm-themes/${this.state.editorTheme}.css`} rel='stylesheet' />;
-	},
-
 	renderEditor : function(){
 		if(this.isText()){
 			return <>
-				{this.renderEditorCSSLink()}
 				<CodeEditor key='codeEditor'
 					ref='codeEditor'
 					language='gfm'
@@ -288,7 +283,6 @@ const Editor = createClass({
 		}
 		if(this.isStyle()){
 			return <>
-				{this.renderEditorCSSLink()}
 				<CodeEditor key='codeEditor'
 					ref='codeEditor'
 					language='css'
diff --git a/shared/naturalcrit/codeEditor/codeEditor.jsx b/shared/naturalcrit/codeEditor/codeEditor.jsx
index 244784f8e..0db6ca353 100644
--- a/shared/naturalcrit/codeEditor/codeEditor.jsx
+++ b/shared/naturalcrit/codeEditor/codeEditor.jsx
@@ -396,7 +396,10 @@ const CodeEditor = createClass({
 	//----------------------//
 
 	render : function(){
-		return <div className='codeEditor' ref='editor' style={this.props.style}/>;
+		return <>
+			<link href={`../homebrew/cm-themes/${this.props.editorTheme}.css`} rel='stylesheet' />
+			<div className='codeEditor' ref='editor' style={this.props.style}/>
+		</>;
 	}
 });