diff --git a/src/atom/editor.coffee b/src/atom/editor.coffee
index d7856ae3e..4454d5d2d 100644
--- a/src/atom/editor.coffee
+++ b/src/atom/editor.coffee
@@ -64,6 +64,7 @@ class Editor extends Template
 
     handleEvents: ->
       @on 'focus', =>
+        @hiddenInput.css(top: @scrollTop())
         @hiddenInput.focus()
         false