diff --git a/package.json b/package.json
index ae923f99c..a9eab6b3b 100644
--- a/package.json
+++ b/package.json
@@ -112,7 +112,7 @@
     "symbols-view": "0.111.1",
     "tabs": "0.90.2",
     "timecop": "0.33.1",
-    "tree-view": "0.201.3",
+    "tree-view": "0.201.4",
     "update-package-dependencies": "0.10.0",
     "welcome": "0.34.0",
     "whitespace": "0.32.2",
diff --git a/src/text-editor.coffee b/src/text-editor.coffee
index 06e58aa1e..c1a4150e9 100644
--- a/src/text-editor.coffee
+++ b/src/text-editor.coffee
@@ -3232,7 +3232,7 @@ class TextEditor extends Model
   # top of the visible area.
   setFirstVisibleScreenRow: (screenRow, fromView) ->
     unless fromView
-      maxScreenRow = @getLineCount() - 1
+      maxScreenRow = @getScreenLineCount() - 1
       unless @config.get('editor.scrollPastEnd')
         height = @displayBuffer.getHeight()
         lineHeightInPixels = @displayBuffer.getLineHeightInPixels()
@@ -3250,7 +3250,7 @@ class TextEditor extends Model
     height = @displayBuffer.getHeight()
     lineHeightInPixels = @displayBuffer.getLineHeightInPixels()
     if height? and lineHeightInPixels?
-      Math.min(@firstVisibleScreenRow + Math.floor(height / lineHeightInPixels), @getLineCount() - 1)
+      Math.min(@firstVisibleScreenRow + Math.floor(height / lineHeightInPixels), @getScreenLineCount() - 1)
     else
       null