diff --git a/www/code/main.js b/www/code/main.js
index 7591f12a2..44cab6d36 100644
--- a/www/code/main.js
+++ b/www/code/main.js
@@ -388,11 +388,17 @@ define([
                 });
 
                 // add the splitter
+                var $preview = $iframe.find('#previewContainer');
                 var splitter = $('<div>', {
                     'class': 'cp-splitter'
-                }).appendTo($iframe.find('#previewContainer'));
+                }).appendTo($preview);
+
+                $preview.on('scroll', function() {
+                    splitter.css('top', $preview.scrollTop() + 'px');
+                });
 
                 var $target = $iframe.find('.CodeMirror');
+
                 splitter.on('mousedown', function (e) {
                     e.preventDefault();
                     var x = e.pageX;