diff --git a/lib/ace/virtual_renderer.js b/lib/ace/virtual_renderer.js
index c7fa8d63..4175a741 100644
--- a/lib/ace/virtual_renderer.js
+++ b/lib/ace/virtual_renderer.js
@@ -617,9 +617,9 @@ var VirtualRenderer = function(container, theme) {
     this.screenToTextCoordinates = function(pageX, pageY) {
         var canvasPos = this.scroller.getBoundingClientRect();
 
-        var col = Math.round((pageX + this.scroller.scrollLeft - canvasPos.left - this.$padding)
+        var col = Math.round((pageX + this.scroller.scrollLeft - canvasPos.left - this.$padding - dom.getPageScrollLeft())
                 / this.characterWidth);
-        var row = Math.floor((pageY + this.scrollTop - canvasPos.top - window.pageYOffset)
+        var row = Math.floor((pageY + this.scrollTop - canvasPos.top - dom.getPageScrollTop())
                 / this.lineHeight);
 
         return this.session.screenToDocumentPosition(row, Math.max(col, 0));
diff --git a/support/pilot b/support/pilot
index c0cab19c..cbfac498 160000
--- a/support/pilot
+++ b/support/pilot
@@ -1 +1 @@
-Subproject commit c0cab19cbb5d44df98bae0060c782a6f30464afe
+Subproject commit cbfac498d30d43fdb7687d198c5b752736222c2f