diff --git a/client/less/challenge.less b/client/less/challenge.less
index 30a491e524..262277f458 100644
--- a/client/less/challenge.less
+++ b/client/less/challenge.less
@@ -1,3 +1,8 @@
+.challenges-editor {
+  height: 100%;
+  width: 99%;
+}
+
 .challenge-step-description {
   font-size: 1.5em;
 }
diff --git a/client/less/code-mirror.less b/client/less/code-mirror.less
new file mode 100644
index 0000000000..a2535218c1
--- /dev/null
+++ b/client/less/code-mirror.less
@@ -0,0 +1,27 @@
+.CodeMirror span {
+  font-size: 18px;
+  font-family: "Ubuntu Mono";
+  padding-bottom: 0px;
+  margin-bottom: 0px;
+  height: 100%;
+}
+
+.CodeMirror {
+  border-radius: 5px;
+  height: auto;
+  line-height: 1 !important;
+}
+
+.CodeMirror-linenumber {
+  font-size: 18px;
+  font-family: "Ubuntu Mono";
+}
+
+.CodeMirror-scroll {
+  padding-bottom: 30px;
+}
+
+.challenge-log .CodeMirror {
+  height: 100%;
+  width: 100%;
+}
diff --git a/client/less/main.less b/client/less/main.less
index 481ac5a22c..3bfdb42da9 100644
--- a/client/less/main.less
+++ b/client/less/main.less
@@ -686,53 +686,19 @@ form.update-email .btn{
   fill: #ddd !important
 }
 
-.CodeMirror span {
-  font-size: 18px;
-  font-family: "Ubuntu Mono";
-  padding-bottom: 0px;
-  margin-bottom: 0px;
-  height: 100%;
-}
-
-.CodeMirror {
-  line-height: 1 !important;
-}
-
-.CodeMirror-linenumber {
-  font-size: 18px;
-  font-family: "Ubuntu Mono";
-}
-
-.challenges-editor {
-  height: 100%;
-  width: 99%;
-}
-
 .scroll-locker {
   overflow-x: hidden;
   overflow-y: auto;
 }
 
-div.CodeMirror-scroll {
-  padding-bottom: 30px;
-}
-
 .test-vertical-center {
   margin-top: 8px;
 }
 
-.cm-s-monokai.CodeMirror {
-  border-radius: 5px;
-}
 .courseware-height {
   min-height: 650px;
 }
 
-.challenge-log .CodeMirror {
-  height: 100%;
-  width: 100%;
-}
-
 .btn {
   font-weight: 400;
   white-space: normal;
@@ -1168,6 +1134,7 @@ and (max-width : 400px)  {
 
 @import "chat.less";
 @import "jobs.less";
+@import 'code-mirror.less';
 @import "challenge.less";
 @import "toastr.less";
 @import "map.less";
diff --git a/server/views/partials/react-stylesheets.jade b/server/views/partials/react-stylesheets.jade
index abf1cded32..c2b5eae507 100644
--- a/server/views/partials/react-stylesheets.jade
+++ b/server/views/partials/react-stylesheets.jade
@@ -1,10 +1,10 @@
 link(rel='stylesheet', type='text/css' href='/css/lato.css')
 link(rel='stylesheet', type='text/css' href='/css/ubuntu.css')
 link(rel='stylesheet', href='/bower_components/font-awesome/css/font-awesome.min.css')
-link(rel='stylesheet', href=rev('/css', 'main.css'))
 link(rel='stylesheet', href='/bower_components/CodeMirror/lib/codemirror.css')
 link(rel='stylesheet', href='/bower_components/CodeMirror/addon/lint/lint.css')
 link(rel='stylesheet', href='/bower_components/CodeMirror/theme/monokai.css')
+link(rel='stylesheet', href=rev('/css', 'main.css'))
 
 include meta
 meta(charset='utf-8')