diff --git a/src/app/edit-session.coffee b/src/app/edit-session.coffee
index c3eaa685a..e3a906e8a 100644
--- a/src/app/edit-session.coffee
+++ b/src/app/edit-session.coffee
@@ -348,7 +348,7 @@ class EditSession
       foldedRows = []
       rows = [selection.start.row..selection.end.row]
       if selection.start.row isnt selection.end.row and selection.end.column is 0
-        rows.pop() unless @isFoldedAtScreenRow(@screenPositionForBufferPosition(selection.end).row)
+        rows.pop() unless @isFoldedAtBufferRow(selection.end.row)
       for row in rows
         screenRow = @screenPositionForBufferPosition([row]).row
         if @isFoldedAtScreenRow(screenRow)
@@ -381,7 +381,7 @@ class EditSession
       foldedRows = []
       rows = [selection.end.row..selection.start.row]
       if selection.start.row isnt selection.end.row and selection.end.column is 0
-        rows.shift() unless @isFoldedAtScreenRow(@screenPositionForBufferPosition(selection.end).row)
+        rows.shift() unless @isFoldedAtBufferRow(selection.end.row)
       for row in rows
         screenRow = @screenPositionForBufferPosition([row]).row
         if @isFoldedAtScreenRow(screenRow)