diff --git a/common/lib/capa/capa/templates/textbox.html b/common/lib/capa/capa/templates/textbox.html
index dbdb597cf9..aa87682e59 100644
--- a/common/lib/capa/capa/templates/textbox.html
+++ b/common/lib/capa/capa/templates/textbox.html
@@ -27,9 +27,6 @@
 
   <br/>
 
-  <script type="text/javascript" src="${ settings.LIB_URL }CodeMirror/codemirror.js"></script>
-  <script type="text/javascript" src="${ settings.LIB_URL }CodeMirror/python.js"></script>
-  <link rel="stylesheet" href="${ settings.LIB_URL }CodeMirror/codemirror.css" />
   <script>
     // Note: We need to make the area follow the CodeMirror for this to work.
     $(function(){
@@ -42,7 +39,10 @@
     });
   </script>
   <style type="text/css">
-    .CodeMirror {border-style: solid;
-      border-width: 1px;}
+    .CodeMirror {
+        border: 2px solid black;
+        font-size: 14px;
+        line-height: 18px;
+    }
   </style>
 </section>
diff --git a/lms/static/sass/base/_base.scss b/lms/static/sass/base/_base.scss
index 6e4881865e..ba0f47de52 100644
--- a/lms/static/sass/base/_base.scss
+++ b/lms/static/sass/base/_base.scss
@@ -43,6 +43,10 @@ p {
 span {
   font: normal 1em/1.6em $sans-serif;
 }
+/* Fix for CodeMirror: prevent top-level span from affecting deeply-embedded span in CodeMirror */
+.CodeMirror span {
+  font: inherit;
+}
 
 p + p, ul + p, ol + p {
   margin-top: 20px;