diff --git a/TODO b/TODO
index 00137135c6abe7a85de92be346637523f7d37a60..cd2c8ac4a3a232341d6bd426d5dd11a67619e8d4 100644
--- a/TODO
+++ b/TODO
@@ -13,8 +13,6 @@
 
 - flow overview
 
-- code window resize
-
 - escape student answers in analytics
 
 Ideas
diff --git a/course/templates/course/flow-page.html b/course/templates/course/flow-page.html
index 0507d7304f6f5740414ed7f5a096daf614912ee9..dec94354d03ec9f30a0f84bc6ba6ca38280fb3bf 100644
--- a/course/templates/course/flow-page.html
+++ b/course/templates/course/flow-page.html
@@ -231,6 +231,21 @@
 
   {# }}} #}
 
+  <script type="text/javascript">
+    $("div.CodeMirror")
+    .resizable({
+          resize: function (event, ui)
+          {
+            $("div.CodeMirror").each(
+              function ()
+              {
+                var cm = this.CodeMirror;
+                cm.refresh();
+              });
+          }
+      });
+  </script>
+
 {% endblock %}
 
 {# vim: set foldmethod=marker: #}
diff --git a/courseflow/settings.py b/courseflow/settings.py
index 8c70bf7878853855d3718b2069b811d90bc1e4a0..17e0ecd7a819488cef40aa8db16dd3a1c1af7bcc 100644
--- a/courseflow/settings.py
+++ b/courseflow/settings.py
@@ -89,6 +89,7 @@ BOWER_INSTALLED_APPS = (
     "MathJax",
     "codemirror",
     "fullcalendar",
+    "jqueryui",
     )
 
 CODEMIRROR_PATH = "codemirror"
diff --git a/courseflow/templates/base.html b/courseflow/templates/base.html
index 4d2a76e8545d596ce5c332b7dc2492c1124f8b8d..72878de81ef086ce9de4d2c2b064f6dd2635014c 100644
--- a/courseflow/templates/base.html
+++ b/courseflow/templates/base.html
@@ -14,13 +14,15 @@
     <title>{%block title %}CourseFlow{% endblock %}</title>
 
     <link href="{% static "bootstrap/dist/css/bootstrap.css" %}" rel="stylesheet">
+    <link href="{% static "jqueryui/themes/smoothness/jquery-ui.css" %}" rel="stylesheet">
 
-    <link rel="stylesheet" href="/static/css/style.css" >
     <link rel="stylesheet" href="{% static "fontawesome/css/font-awesome.css" %}">
+    <link rel="stylesheet" href="/static/css/style.css" >
 
     {# Don't be tempted to move all this JS stuff down to the end. #}
     {# The datepicker generates inline JS that relies on this being loaded. #}
     <script src="{% static "jquery/dist/jquery.js" %}"></script>
+    <script src="{% static "jqueryui/jquery-ui.js" %}"></script>
     <script src="{% static "bootstrap/dist/js/bootstrap.js" %}"></script>
 
     {%block header_extra %}{% endblock %}