diff --git a/public/js/main_0.0.3.js b/public/js/main_0.0.3.js
index 5a19e61fe5..e502bd50d3 100644
--- a/public/js/main_0.0.3.js
+++ b/public/js/main_0.0.3.js
@@ -311,6 +311,10 @@ $(document).ready(function() {
 
   $('#story-submit').on('click', storySubmitButtonHandler);
 
+    if($('.editorScrollDiv').html() !== 'undefined'){
+        $('.editorScrollDiv').css("height",$(window).height()-($('.navbar').height()+$('.footer').height()+100) + "px");
+    }
+
     //fakeiphone positioning hotfix
     if($('.iphone-position').html() !==undefined || $('.iphone').html() !== undefined){
         var startIphonePosition = parseInt($('.iphone-position').css('top').replace('px', ''));
diff --git a/server/views/coursewares/showHTML.jade b/server/views/coursewares/showHTML.jade
index 26ae70c991..60cc98e1e2 100644
--- a/server/views/coursewares/showHTML.jade
+++ b/server/views/coursewares/showHTML.jade
@@ -65,10 +65,11 @@ block content
                     var challengeType = !{JSON.stringify(challengeType)};
                     var started = Math.floor(Date.now());
         .col-xs-12.col-sm-12.col-md-5.col-lg-6
-            #mainEditorPanel
-                form.code
-                    .form-group.codeMirrorView
-                        textarea#codeEditor(autofocus=true, style='display: none;')
+            .editorScrollDiv(style = "overflow-y: scroll; overflow-x: hidden;")
+                #mainEditorPanel
+                    form.code
+                        .form-group.codeMirrorView
+                            textarea#codeEditor(autofocus=true, style='display: none;')
         .col-md-4.col-lg-3
             .hidden-xs.hidden-sm
                 img.iphone-position.iframe-scroll(src="https://s3.amazonaws.com/freecodecamp/iphone6-frame.png")
diff --git a/server/views/coursewares/showJS.jade b/server/views/coursewares/showJS.jade
index 866c5e4fd1..8d178dc186 100644
--- a/server/views/coursewares/showJS.jade
+++ b/server/views/coursewares/showJS.jade
@@ -66,11 +66,12 @@ block content
                     var _ = R;
                     var dashed = !{JSON.stringify(dashedName)};
         .col-xs-12.col-sm-12.col-md-8
-            #mainEditorPanel
-                form.code
-                    .form-group.codeMirrorView
-                        textarea#codeEditor(autofocus=true, style='display: none;')
-                script(src='/js/lib/coursewares/coursewaresJSFramework_0.0.6.js')
+            .editorScrollDiv(style = "overflow-y: scroll; overflow-x: hidden;")
+                #mainEditorPanel
+                    form.code
+                        .codeMirrorView
+                            textarea#codeEditor(autofocus=true, style='display: none;')
+                    script(src='/js/lib/coursewares/coursewaresJSFramework_0.0.6.js')
     #complete-courseware-dialog.modal(tabindex='-1')
         .modal-dialog.animated.zoomIn.fast-animation
             .modal-content